From 36b96a5557fe36a40278efcf3ef183c7e5c96cd6 Mon Sep 17 00:00:00 2001 From: Jean-Marie Favreau Date: Sun, 12 Jan 2025 00:19:42 +0100 Subject: [PATCH] =?UTF-8?q?Fix=20deux=20erreurs=20500=20rapport=C3=A9es=20?= =?UTF-8?q?sur=20#266?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - cas d'une image locale qui n'existe pas - problème de messages multiples --- src/agenda_culturel/forms.py | 2 +- src/agenda_culturel/models.py | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/agenda_culturel/forms.py b/src/agenda_culturel/forms.py index df8e694..88a0a75 100644 --- a/src/agenda_culturel/forms.py +++ b/src/agenda_culturel/forms.py @@ -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'] diff --git a/src/agenda_culturel/models.py b/src/agenda_culturel/models.py index 211fc96..c0fa6a4 100644 --- a/src/agenda_culturel/models.py +++ b/src/agenda_culturel/models.py @@ -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):