Fix deux erreurs 500 rapportées sur #266

- cas d'une image locale qui n'existe pas
- problème de messages multiples
This commit is contained in:
Jean-Marie Favreau 2025-01-12 00:19:42 +01:00
parent 875114a03b
commit 36b96a5557
2 changed files with 2 additions and 4 deletions

View File

@ -381,7 +381,7 @@ class EventForm(GroupFormMixin, ModelForm):
super().clean()
# when cloning an existing event, we need to copy the local image
if self.cleaned_data['local_image'] is None and \
if ((not 'local_image' in self.cleaned_data) or (self.cleaned_data['local_image'] is None)) and \
not self.cleaned_data['old_local_image'] is None and \
self.cleaned_data['old_local_image'] != "":
basename = self.cleaned_data['old_local_image']

View File

@ -1177,11 +1177,9 @@ class Event(models.Model):
def get_contributor_message(self):
types = [Message.TYPE.FROM_CONTRIBUTOR, Message.TYPE.FROM_CONTRIBUTOR_NO_MSG]
if self.other_versions is None or self.other_versions.representative is None:
logger.warning("cas single")
return Message.objects.filter(related_event=self.pk, message_type__in=types, closed=False)
else:
logger.warning("cas multiple")
return Message.objects.filter(related_event__in=self.other_versions.get_duplicated(), message_type__in=types, closed=False).first()
return Message.objects.filter(related_event__in=self.other_versions.get_duplicated(), message_type__in=types, closed=False)
def notify_if_required(self, request):