From 931ecb41382904e51b0bdf91ee8422459e7c978c Mon Sep 17 00:00:00 2001
From: Patrick Mayr <patrick@fet.at>
Date: Tue, 11 Jan 2022 09:52:16 +0000
Subject: [PATCH] change slug 'A' and 'P' to 'active' and 'pension'

---
 fet2020/members/urls.py              | 6 +++---
 fet2020/members/views.py             | 6 ++++--
 fet2020/templates/layout.html        | 2 +-
 fet2020/templates/members/index.html | 2 +-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/fet2020/members/urls.py b/fet2020/members/urls.py
index 8e404480..0dc10943 100644
--- a/fet2020/members/urls.py
+++ b/fet2020/members/urls.py
@@ -5,13 +5,13 @@ from . import views
 
 urlpatterns = [
     path("", views.index, name="members"),
-    path("<str:filter>", views.members_view, name="members_view"),
+    path("<str:filter>/", views.members_view, name="members_view"),
 ]
 
 member_urlpatterns = [
-    path("<str:member_id>", views.profile_view, name="member"),
+    path("<str:member_id>/", views.profile_view, name="member"),
 ]
 
 jobs_urlpatterns = [
-    path("<str:slug>", views.jobs_view, name="jobs"),
+    path("<str:slug>/", views.jobs_view, name="jobs"),
 ]
diff --git a/fet2020/members/views.py b/fet2020/members/views.py
index aad2f9be..09fddea8 100644
--- a/fet2020/members/views.py
+++ b/fet2020/members/views.py
@@ -79,8 +79,10 @@ def jobs_view(request, slug=None):
 def members_view(request, filter=None):
     pinned_job_groups, unpinned_job_groups = __get_job_groups()
 
-    if filter in Member.MemberRole:
-        members = deque(Member.all_members.filter(role=filter))
+    for elem in Member.MemberRole:
+        if filter == elem.label.lower():
+            members = deque(Member.all_members.filter(role=elem.value))
+            break
     else:
         logger.info("Wrong member role '{}'".format(filter))
         raise Http404("no member role")
diff --git a/fet2020/templates/layout.html b/fet2020/templates/layout.html
index ddd9e246..99998627 100644
--- a/fet2020/templates/layout.html
+++ b/fet2020/templates/layout.html
@@ -59,7 +59,7 @@
             {% endif %}
             <li><a class="button header-btn header-link" href="{% url 'posts:posts.index' %}">News</a></li>
             <!-- show active members first -->
-            <li><a class="button header-btn header-link" href="{% url 'members_view' 'A' %}">Fachschaft</a></li>
+            <li><a class="button header-btn header-link" href="{% url 'members_view' 'active' %}">Fachschaft</a></li>
             <li><a class="button header-btn header-link" href="{% url 'gallery' %}">Galerie</a></li>
             <li><a class="button header-btn header-link" href="{% url 'blackboard' %}">Blackboard</a></li>
             <li><a class="button header-btn header-link" href="{% url 'contact' %}">Kontakt</a></li>
diff --git a/fet2020/templates/members/index.html b/fet2020/templates/members/index.html
index 7b4c1afb..4ededad0 100644
--- a/fet2020/templates/members/index.html
+++ b/fet2020/templates/members/index.html
@@ -23,7 +23,7 @@
         {% endfor %}
 
         <div class="cell large-2 medium-4 small-6">
-            <a class="button memb-btn {% if '/members/P' == request.path %} active {% endif %}" href="{% url 'members_view' 'P' %}">
+            <a class="button memb-btn {% if 'pension' in request.path %} active {% endif %}" href="{% url 'members_view' 'pension' %}">
                 Pension
             </a>
         </div>