Compare commits

..

No commits in common. "965202485286daf61d29a8271f390eb004805c6a" and "f226d3cac661af1c6ebf8d7d45d0a392a6e93157" have entirely different histories.

3 changed files with 3 additions and 8 deletions

View File

@ -4,7 +4,7 @@ import warnings
from icalendar import vDatetime
import bbcode
from datetime import datetime, date, timedelta
from datetime import datetime, date
from bs4 import BeautifulSoup, MarkupResemblesLocatorWarning
from .extractor import *
@ -67,12 +67,6 @@ class ICALExtractor(Extractor):
start_day, start_time = self.get_dt_item_from_vevent(event, "DTSTART")
end_day, end_time = self.get_dt_item_from_vevent(event, "DTEND")
# if the start and end are only defined by dates (and not times),
# then the event does not occurs on the last day (because it is the end
# of the event...)
if not start_time and not end_time and start_day != end_day:
end_day = end_day + timedelta(days=-1)
location = self.get_item_from_vevent(event, "LOCATION")
if location is None:

View File

@ -463,6 +463,7 @@ class Event(models.Model):
if not self.exact_location:
for p in Place.objects.all():
if p.match(self):
logger.warning("Found a place for an imported event: " + p.name)
self.exact_location = p
break

View File

@ -34,7 +34,7 @@ Mettre l'événement {{ event.title }} à la corbeille
{% endif %}
</p>
{{ form }}
<div class="grid buttons">
<div class="grid">
<a href="{{ cancel_url }}" role="button" class="secondary">Annuler</a>
<input type="submit" value="Confirmer">
</div>