entrouvert
/
chrono
14
1
Fork 0
Code Issues Pull Requests 5 Releases Wiki Activity

misc: minor cosmetic changes in manager form

This commit is contained in:
Lauréline Guérin 2021-03-12 09:03:39 +01:00
parent 1df9409649
commit 379c6442a5
No known key found for this signature in database
GPG Key ID: 1FAB9B9B4F93D473
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
chrono/manager/forms.py
View File

@ -27,7 +27,7 @@ from django.db import transaction
from django.forms import ValidationError
from django.utils.encoding import force_text
from django.utils.six import StringIO
from django.utils.timezone import now, localtime, make_aware, make_naive
from django.utils.timezone import now, make_aware, make_naive
from django.utils.translation import ugettext_lazy as _
from chrono.agendas.models import (
@ -233,15 +233,17 @@ class EventForm(forms.ModelForm):
}
self.instance.recurrences.update(**update_fields)
event = super().save(*args, **kwargs)
if event.recurrence_end_date:
self.instance.recurrences.filter(start_datetime__gt=event.recurrence_end_date).delete()
super().save(*args, **kwargs)
if self.instance.recurrence_end_date:
self.instance.recurrences.filter(
start_datetime__gt=self.instance.recurrence_end_date
).delete()
excluded_datetimes = [
make_naive(dt)
for dt in self.instance.recurrences.values_list('start_datetime', flat=True)
]
event.create_all_recurrences(excluded_datetimes)
return event
self.instance.create_all_recurrences(excluded_datetimes)
return self.instance
class AgendaResourceForm(forms.Form):