From 03a35065f6b74d42c4b83ad9842f4ac0c03d7157 Mon Sep 17 00:00:00 2001 From: Jean-Marie Favreau Date: Sun, 9 Mar 2025 12:07:17 +0100 Subject: [PATCH] Clean nom fichier ical --- src/agenda_culturel/filters.py | 10 +++++++--- src/agenda_culturel/views.py | 5 +---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/agenda_culturel/filters.py b/src/agenda_culturel/filters.py index 255457b..fc0e3f5 100644 --- a/src/agenda_culturel/filters.py +++ b/src/agenda_culturel/filters.py @@ -212,9 +212,13 @@ class EventFilter(django_filters.FilterSet): def to_str(self, prefix=""): self.form.full_clean() result = " ".join( - [t for t in self.get_tags()] - + ["~" + t for t in self.get_exclude_tags()] - + [str(self.get_position()), str(self.get_radius())] + [ + str(x) + for x in [t for t in self.get_tags()] + + ["~" + t for t in self.get_exclude_tags()] + + [self.get_position(), self.get_radius()] + if x is not None + ] ) if len(result) > 0: result = prefix + result diff --git a/src/agenda_culturel/views.py b/src/agenda_culturel/views.py index efb0380..0c61829 100644 --- a/src/agenda_culturel/views.py +++ b/src/agenda_culturel/views.py @@ -1081,10 +1081,7 @@ def export_ical(request, cat=None): if extra is None: extra = "" if category is not None: - if extra != "": - extra = " " + category.name + " " + extra - else: - extra = " " + category.name + extra += " " + category response["Content-Disposition"] = "attachment; filename={0}{1}{2}".format( "Pommes de lune", extra, ".ics" )