wip

gip-inclusion · May 2, 2024 · f56579c · f56579c
1 parent d666a0b
commit f56579c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/lacommunaute/forum_conversation/views.py b/lacommunaute/forum_conversation/views.py
@@ -142,6 +142,7 @@ def get_context_data(self, **kwargs):
         context["active_filter_name"] = (
             getattr(Filters, self.get_filter(), Filters.ALL).label if self.get_filter() else Filters.ALL.label
         )
+        context["active_tag"] = self.get_tags()
         context["display_filter_dropdown"] = False if self.request.GET.get("page") else True
 
         context["loadmoretopic_suffix"] = "topics"

diff --git a/lacommunaute/templates/forum_conversation/partials/topic_filter.html b/lacommunaute/templates/forum_conversation/partials/topic_filter.html
@@ -18,7 +18,7 @@
                                     <button id="filtertopics-button"
                                             hx-target="#topicsarea"
                                             hx-swap="outerHTML"
-                                            hx-get="{% url 'forum_conversation_extension:topics' %}?filter={{ filter.0 }}"
+                                            hx-get="{% url 'forum_conversation_extension:topics' %}?filter={{ filter.0 }}{% if active_tag %}&tag={{ active_tag }}{% endif %}"
                                             class="dropdown-item matomo-event"
                                             data-matomo-category="engagement"
                                             data-matomo-action="filter"

diff --git a/lacommunaute/templates/forum_conversation/topic_list.html b/lacommunaute/templates/forum_conversation/topic_list.html
@@ -9,7 +9,7 @@
     {% get_permission 'can_download_files' forum request.user as user_can_download_files %}
 {% endif %}
 <div id="topicsarea">
-    {% include "forum_conversation/partials/topic_filter.html" %}
+    {% include "forum_conversation/partials/topic_filter.html" with active_tag=active_tag %}
     {% if topics or not hide_if_empty %}
         {% for topic in topics %}
             <div class="row">

diff --git a/lacommunaute/templates/forum_conversation/topics_public.html b/lacommunaute/templates/forum_conversation/topics_public.html
@@ -35,7 +35,7 @@ <h2 class="mt-3">
                 <div class="s-section__col col-12">
                     <div class="c-box">
                         {% with topics=topics %}
-                            {% include "forum_conversation/topic_list.html" %}
+                            {% include "forum_conversation/topic_list.html" with active_tag=active_tag %}
                         {% endwith %}
                     </div>
                 </div>