From 3dd4b02e5bba5e2570aef884676bc78e14bf9674 Mon Sep 17 00:00:00 2001 From: Jean-Marie Favreau Date: Sat, 21 Sep 2024 21:04:56 +0200 Subject: [PATCH] =?UTF-8?q?On=20corrige=20l'affichage=20des=20=C3=A9v?= =?UTF-8?q?=C3=A9nements=20d=C3=A9j=C3=A0=20soumis?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/agenda_culturel/views.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/agenda_culturel/views.py b/src/agenda_culturel/views.py index 08c58a8..75fe1cb 100644 --- a/src/agenda_culturel/views.py +++ b/src/agenda_culturel/views.py @@ -9,6 +9,7 @@ from django.contrib.auth.mixins import ( from django.http import QueryDict from django import forms from django.contrib.postgres.search import SearchQuery, SearchHeadline +from django.utils.safestring import mark_safe from django.http import HttpResponseRedirect, HttpResponse from django.urls import reverse @@ -672,8 +673,6 @@ class URLEventEvaluation: return self.exists() and self.existing is None def is_event_visible(self): - if not self.is_new(): - return False return self.event is not None def get_event(self): @@ -706,10 +705,10 @@ def import_from_urls(request): # for each not new, add a message for uc in ucat: if uc.exists() and not uc.is_new(): - if uc.is_event_visible(): + if uc.is_event_visible(): # TODO messages.info( request, - _('{} has not been submitted since it''s already known: {}.').format(uc.url).format(uc.get_link()) + mark_safe(_('{} has not been submitted since it''s already known: {}.').format(uc.url, uc.get_link())) ) else: messages.info( @@ -761,7 +760,7 @@ def import_from_url(request): if uc.is_event_visible(): messages.info( request, - _('{} has not been submitted since it''s already known: {}.').format(uc.url).format(uc.get_link()) + mark_safe(_('{} has not been submitted since it''s already known: {}.').format(uc.url, uc.get_link())) ) return HttpResponseRedirect(uc.get_event().get_absolute_url()) else: @@ -1585,7 +1584,6 @@ def apply_categorisation_rules(request): nb = 0 for epk, c in form.get_validated(): e = Event.objects.get(pk=epk) - logger.warning("cat " + c) cat = Category.objects.get(name=c) e.category = cat e.save()