From d39ea43efbf9ffd756330099931e673609e808eb Mon Sep 17 00:00:00 2001 From: Jean-Marie Favreau Date: Wed, 20 Nov 2024 22:55:04 +0100 Subject: [PATCH] =?UTF-8?q?les=20tags=20ne=20sont=20plus=20des=20sous-cat?= =?UTF-8?q?=C3=A9gories?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/agenda_culturel/filters.py | 4 +--- src/agenda_culturel/forms.py | 2 +- .../migrations/0113_remove_tag_category.py | 17 +++++++++++++++++ src/agenda_culturel/models.py | 9 --------- src/agenda_culturel/static/style.scss | 1 - .../templates/agenda_culturel/tags.html | 19 +++++-------------- src/agenda_culturel/templatetags/tag_extra.py | 8 ++------ 7 files changed, 26 insertions(+), 34 deletions(-) create mode 100644 src/agenda_culturel/migrations/0113_remove_tag_category.py diff --git a/src/agenda_culturel/filters.py b/src/agenda_culturel/filters.py index 599edaf..646d75a 100644 --- a/src/agenda_culturel/filters.py +++ b/src/agenda_culturel/filters.py @@ -284,13 +284,11 @@ class EventFilter(django_filters.FilterSet): def is_selected_tag(self, tag): return "tags" in self.form.cleaned_data and tag in self.form.cleaned_data["tags"] - def get_url_add_tag(self, tag, category=None): + def get_url_add_tag(self, tag): full_path = self.request.get_full_path() result = full_path + ('&' if '?' in full_path else '?') + 'tags=' + str(tag) - if not category is None: - result = self.get_url_add_categories([category.pk], result) return result def tag_exists(self, tag): diff --git a/src/agenda_culturel/forms.py b/src/agenda_culturel/forms.py index b1a01d8..dd52e4f 100644 --- a/src/agenda_culturel/forms.py +++ b/src/agenda_culturel/forms.py @@ -46,7 +46,7 @@ class TagForm(ModelForm): class Meta: model = Tag - fields = ["name", "description", "in_included_suggestions", "in_excluded_suggestions", "principal", "category"] + fields = ["name", "description", "in_included_suggestions", "in_excluded_suggestions", "principal"] widgets = { "name": HiddenInput() } diff --git a/src/agenda_culturel/migrations/0113_remove_tag_category.py b/src/agenda_culturel/migrations/0113_remove_tag_category.py new file mode 100644 index 0000000..c39634d --- /dev/null +++ b/src/agenda_culturel/migrations/0113_remove_tag_category.py @@ -0,0 +1,17 @@ +# Generated by Django 4.2.9 on 2024-11-20 21:40 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('agenda_culturel', '0112_place_description'), + ] + + operations = [ + migrations.RemoveField( + model_name='tag', + name='category', + ), + ] diff --git a/src/agenda_culturel/models.py b/src/agenda_culturel/models.py index 0d5626b..74907e8 100644 --- a/src/agenda_culturel/models.py +++ b/src/agenda_culturel/models.py @@ -203,15 +203,6 @@ class Tag(models.Model): default=False, ) - category = models.ForeignKey( - Category, - verbose_name=_("Category"), - help_text=_("This tags corresponds to a sub-category of the given category"), - null=True, - blank=True, - default=None, - on_delete=models.SET_NULL, - ) def get_absolute_url(self): return reverse("view_tag", kwargs={"t": self.name}) diff --git a/src/agenda_culturel/static/style.scss b/src/agenda_culturel/static/style.scss index 639043e..ee634df 100644 --- a/src/agenda_culturel/static/style.scss +++ b/src/agenda_culturel/static/style.scss @@ -198,7 +198,6 @@ details[role="list"] summary + ul li.selected>a:hover { @extend .outline; font-size: 90%; padding: 0.15em 0.4em 0.3em 0.4em; - overflow: hidden; text-align: left; } diff --git a/src/agenda_culturel/templates/agenda_culturel/tags.html b/src/agenda_culturel/templates/agenda_culturel/tags.html index 41d8633..d4c1a65 100644 --- a/src/agenda_culturel/templates/agenda_culturel/tags.html +++ b/src/agenda_culturel/templates/agenda_culturel/tags.html @@ -32,20 +32,11 @@
{% if tag.obj %} {% if not tag.obj.description|html_vide %}{{ tag.obj.description|safe }}{% endif %} - {% if tag.obj.category or tag.obj.principal or tag.obj.in_included_suggestions or tag.obj.in_excluded_suggestions %} - {% endif %} {% else %} diff --git a/src/agenda_culturel/templatetags/tag_extra.py b/src/agenda_culturel/templatetags/tag_extra.py index bcdf87d..88c3fd4 100644 --- a/src/agenda_culturel/templatetags/tag_extra.py +++ b/src/agenda_culturel/templatetags/tag_extra.py @@ -53,16 +53,12 @@ def tag_not_in_db(tag, tags): @register.simple_tag def show_suggested_tags(filter): filter.form.full_clean() - tags = Tag.objects.all().filter(principal=True).order_by("name").prefetch_related("category") + tags = Tag.objects.all().filter(principal=True).order_by("name") result = "Suggestion :" for t in tags: if filter.tag_exists(t.name) and not filter.is_selected_tag(t.name): - if not filter.has_category() or t.category is None or filter.get_categories()[0] == t.category: - if filter.has_category(): - result += ' ' + t_button(t.name, filter.get_url_add_tag(t.name), category=t.category) - else: - result += ' ' + t_button(t.name, filter.get_url_add_tag(t.name, t.category), category=t.category) + result += ' ' + t_button(t.name, filter.get_url_add_tag(t.name)) return mark_safe(result)