entrouvert
/
calebasse
Archived
17
0
Fork 0
Code Issues Pull Requests Releases Activity

agenda: improving event type id check

This commit is contained in:
Serghei Mihai 2014-07-07 09:16:14 +02:00
parent 1e0ec553b0
commit 75f679a361
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
calebasse/agenda/views.py
View File

@ -276,10 +276,11 @@ class UpdatePeriodicEventView(BaseEventView):
template_name = 'agenda/new-event.html'
def delete_eventwithact(event):
assert event.event_type.id == 1
assert event.event_type_id == 1
if event.act.id \
and not event.act.is_billed:
event.act.delete()
if not event.act.id or \
not event.act.is_billed:
event.delete()
@ -291,7 +292,7 @@ class DeleteOccurrenceView(TodayOccurrenceMixin, cbv.DeleteView):
def delete(self, request, *args, **kwargs):
self.object = self.get_object()
if self.object.event_type.id == 1:
if self.object.event_type_id == 1:
delete_eventwithact(self.object)
else:
self.object.delete()
@ -310,12 +311,12 @@ class DeleteEventView(cbv.DeleteView):
exception.recurrence_periodicity = None
exception.exception_to = None
exception.save()
if exception.event_type.id == 1:
if exception.event_type_id == 1:
delete_eventwithact(exception)
else:
exception.delete()
if self.object.event_type.id == 1:
if self.object.event_type_id == 1:
delete_eventwithact(self.object)
else:
self.object.delete()