Amélioration du formulaire de déclaration de dupliqué
This commit is contained in:
parent
7c9d930e6f
commit
ad48b667be
@ -501,7 +501,7 @@ class SelectEventInList(Form):
|
|||||||
super().__init__(*args, **kwargs)
|
super().__init__(*args, **kwargs)
|
||||||
|
|
||||||
self.fields["event"].choices = [
|
self.fields["event"].choices = [
|
||||||
(e.pk, str(e.start_day) + " " + e.title + ((", " + e.location) if e.location else "")) for e in events
|
(e.pk, (e.start_time.strftime('%H:%M') + " : " if e.start_time else "") + e.title + ((", " + e.location) if e.location else "")) for e in events
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
|
@ -1578,6 +1578,7 @@ def set_duplicate(request, year, month, day, pk):
|
|||||||
event.other_versions is None
|
event.other_versions is None
|
||||||
or event.other_versions != e.other_versions
|
or event.other_versions != e.other_versions
|
||||||
)
|
)
|
||||||
|
and e.status != Event.STATUS.TRASH
|
||||||
]
|
]
|
||||||
|
|
||||||
form = SelectEventInList(events=others)
|
form = SelectEventInList(events=others)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user