Merge pull request #1387 from ae-utbm/club-list-tweak

Small club list tweaks

club/templates/club/club_list.jinja

@@ -1,6 +1,13 @@
 {% if is_fragment %}
   {% extends "core/base_fragment.jinja" %}
 
+  {% block metatags %}
+    <meta property="og:url" content="{{ request.build_absolute_uri() }}" />
+    <meta property="og:type" content="website" />
+    <meta property="og:title" content="Liste des clubs et assos" />
+    <meta property="og:image" content="{{ request.build_absolute_uri(static("core/img/logo_no_text.png")) }}" />
+  {% endblock %}
+
   {# Don't display tabs and errors #}
   {% block tabs %}
   {% endblock %}

club/views.py

@@ -209,15 +209,15 @@ class ClubListView(AllowFragment, FormMixin, ListView):
 
     def get_form_kwargs(self):
         res = super().get_form_kwargs()
-        if self.request.method == "GET":
+        # if request.GET is empty, the form will interpret club_status as None,
-            res |= {"data": self.request.GET, "initial": self.request.GET}
+        # even though we want it to be initially True,
+        # so we force a defaut True value.
+        res["data"] = {"club_status": True} | self.request.GET.dict()
         return res
 
     def get_queryset(self):
         form: ClubSearchForm = self.get_form()
         qs = self.queryset
-        if not form.is_bound:
-            return qs.filter(is_active=True)
         if not form.is_valid():
             return qs.none()
         if name := form.cleaned_data.get("name"):