Révision 75f679a3
Ajouté par Serghei Mihai (congés, retour 15/05) il y a presque 10 ans
| calebasse/agenda/views.py | ||
|---|---|---|
| 276 | 276 |
template_name = 'agenda/new-event.html' |
| 277 | 277 |
|
| 278 | 278 |
def delete_eventwithact(event): |
| 279 |
assert event.event_type.id == 1
|
|
| 279 |
assert event.event_type_id == 1
|
|
| 280 | 280 |
if event.act.id \ |
| 281 | 281 |
and not event.act.is_billed: |
| 282 | 282 |
event.act.delete() |
| 283 |
|
|
| 283 | 284 |
if not event.act.id or \ |
| 284 | 285 |
not event.act.is_billed: |
| 285 | 286 |
event.delete() |
| ... | ... | |
| 291 | 292 |
|
| 292 | 293 |
def delete(self, request, *args, **kwargs): |
| 293 | 294 |
self.object = self.get_object() |
| 294 |
if self.object.event_type.id == 1:
|
|
| 295 |
if self.object.event_type_id == 1:
|
|
| 295 | 296 |
delete_eventwithact(self.object) |
| 296 | 297 |
else: |
| 297 | 298 |
self.object.delete() |
| ... | ... | |
| 310 | 311 |
exception.recurrence_periodicity = None |
| 311 | 312 |
exception.exception_to = None |
| 312 | 313 |
exception.save() |
| 313 |
if exception.event_type.id == 1:
|
|
| 314 |
if exception.event_type_id == 1:
|
|
| 314 | 315 |
delete_eventwithact(exception) |
| 315 | 316 |
else: |
| 316 | 317 |
exception.delete() |
| 317 | 318 |
|
| 318 |
if self.object.event_type.id == 1:
|
|
| 319 |
if self.object.event_type_id == 1:
|
|
| 319 | 320 |
delete_eventwithact(self.object) |
| 320 | 321 |
else: |
| 321 | 322 |
self.object.delete() |
Formats disponibles : Unified diff
agenda: improving event type id check