Corrige l'incohérence des tags entre la bibliothèque et les billets (#…

…6326)
zestedesavoir · Jun 15, 2022 · d861945 · d861945
1 parent f87657b
commit d861945
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 8 deletions.
diff --git a/templates/header.html b/templates/header.html
@@ -84,7 +84,7 @@
                                                 {% trans "Tags les plus utilisés" %}
                                             </li>
                                             {% for tag in categories.tags %}
-                                                <li><a href="{% url 'publication:list' %}?tag={{ tag.title|urlencode }}">{{ tag }}</a></li>
+                                                <li><a href="{% url 'publication:list' %}?tag={{ tag.slug }}">{{ tag }}</a></li>
                                             {% endfor %}
                                             <li><a href="{% url 'content:tags' %}">Tous les tags</a></li>
                                         </ul>
@@ -139,7 +139,7 @@
                                                 {% trans "Tags les plus utilisés" %}
                                             </li>
                                             {% for tag in categories.tags %}
-                                                <li><a href="{% url 'opinion:list' %}?tag={{ tag.title|urlencode }}">{{ tag }}</a></li>
+                                                <li><a href="{% url 'opinion:list' %}?tag={{ tag.slug }}">{{ tag }}</a></li>
                                             {% endfor %}
                                             <li><a href="{% url 'content:tags' %}?type=opinion">Tous les tags</a></li>
                                         </ul>

diff --git a/templates/searchv2/includes/publishedcontent.part.html b/templates/searchv2/includes/publishedcontent.part.html
@@ -60,9 +60,9 @@ <h3 class="content-title" itemprop="itemListElement">
         {% for tag in search_result.tags|slice:":3" %}
             <li>
                 {% if search_result.content_type == 'OPINION' %}
-                    <a href="{% url 'opinion:list' %}?tag={{ tag|urlencode }}">{{ tag }}</a>
+                    <a href="{% url 'opinion:list' %}?tag={{ tag.slug }}">{{ tag }}</a>
                 {% else %}
-                    <a href="{% url 'publication:list' %}?tag={{ tag|urlencode }}">{{ tag }}</a>
+                    <a href="{% url 'publication:list' %}?tag={{ tag.slug }}">{{ tag }}</a>
                 {% endif %}
             </li>
         {% endfor %}

diff --git a/templates/tutorialv2/includes/content_item.part.html b/templates/tutorialv2/includes/content_item.part.html
@@ -144,7 +144,7 @@ <h3 class="content-title" itemprop="itemListElement">
         <ul class="content-tags" itemprop="keywords">
             {% for tag in content.tags.all|slice:":3" %}
                 <li>
-                  <a href="{{ taglist }}?tag={% if content.is_opinion %}{{ tag.title|urlencode }}{% else %}{{ tag.slug }}{% endif %}">
+                  <a href="{{ taglist }}?tag={{ tag.slug }}">
                     {{ tag.title }}
                   </a>
                 </li>

diff --git a/templates/tutorialv2/includes/tags_authors.part.html b/templates/tutorialv2/includes/tags_authors.part.html
@@ -111,7 +111,7 @@
         {% if publishablecontent.tags.all|length > 0 %}
             <ul class="taglist" itemprop="keywords">
                 {% for tag in publishablecontent.tags.all %}
-                    <li><a href="{{ taglist }}?tag={% if content.is_opinion %}{{ tag.title|urlencode }}{% else %}{{ tag.slug }}{% endif %}" rel="tag">{{ tag.title }}</a></li>
+                    <li><a href="{{ taglist }}?tag={{ tag.slug }}" rel="tag">{{ tag.title }}</a></li>
                 {% endfor %}
             </ul>
         {% endif %}

diff --git a/templates/tutorialv2/view/tags.html b/templates/tutorialv2/view/tags.html
@@ -43,7 +43,7 @@ <h2 class="ico-after ico-tags">
         <div class="content-tags-list">
             {% for tag in tags %}
                 <div class="content-tag">
-                    <a href="{{ url_list }}?tag={% if tags_to_display == 'OPINION' %}{{ tag.title|urlencode }}{% else %}{{ tag.slug }}{% endif %}">
+                    <a href="{{ url_list }}?tag={{ tag.slug }}">
                         <div class="tag-title">{{ tag }}</div>
                         <div class="tag-count">
                             {%  blocktrans with tag_count=tag.num_content plural=tag.num_content|pluralize_fr %}

diff --git a/zds/tutorialv2/tests/tests_opinion_views.py b/zds/tutorialv2/tests/tests_opinion_views.py
@@ -5,6 +5,7 @@
 from django.test import TestCase
 from django.utils.translation import gettext_lazy as _
 
+from zds.forum.tests.factories import TagFactory
 from zds.gallery.tests.factories import UserGalleryFactory
 from zds.member.tests.factories import ProfileFactory, StaffProfileFactory
 from zds.tutorialv2.tests.factories import (
@@ -860,3 +861,8 @@ def test_opinion_alert(self):
 
         alert = Alert.objects.get(pk=alert.pk)
         self.assertTrue(alert.solved)
+
+    def test_tag_list_is_slug(self):
+        tag = TagFactory(title="Test Slug")
+        result = self.client.get(reverse("opinion:list"), {"tag": tag.slug})
+        self.assertEqual(result.status_code, 200)
diff --git a/zds/tutorialv2/views/lists.py b/zds/tutorialv2/views/lists.py
@@ -74,7 +74,7 @@ def get_queryset(self):
             queryset = queryset.filter(content__subcategory__in=[self.subcategory])
 
         if "tag" in self.request.GET:
-            self.tag = get_object_or_404(Tag, title=self.request.GET.get("tag").lower().strip())
+            self.tag = get_object_or_404(Tag, slug=slugify(self.request.GET.get("tag").lower().strip()))
             # TODO: fix me
             # different tags can have same slug such as C/C#/C++, as a first version we get all of them
             queryset = queryset.filter(content__tags__in=[self.tag])