change slug 'A' and 'P' to 'active' and 'pension'

This commit is contained in:
2022-01-11 09:52:16 +00:00
parent 47aafb157e
commit 931ecb4138
4 changed files with 9 additions and 7 deletions

View File

@@ -5,13 +5,13 @@ from . import views
urlpatterns = [ urlpatterns = [
path("", views.index, name="members"), 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 = [ member_urlpatterns = [
path("<str:member_id>", views.profile_view, name="member"), path("<str:member_id>/", views.profile_view, name="member"),
] ]
jobs_urlpatterns = [ jobs_urlpatterns = [
path("<str:slug>", views.jobs_view, name="jobs"), path("<str:slug>/", views.jobs_view, name="jobs"),
] ]

View File

@@ -79,8 +79,10 @@ def jobs_view(request, slug=None):
def members_view(request, filter=None): def members_view(request, filter=None):
pinned_job_groups, unpinned_job_groups = __get_job_groups() pinned_job_groups, unpinned_job_groups = __get_job_groups()
if filter in Member.MemberRole: for elem in Member.MemberRole:
members = deque(Member.all_members.filter(role=filter)) if filter == elem.label.lower():
members = deque(Member.all_members.filter(role=elem.value))
break
else: else:
logger.info("Wrong member role '{}'".format(filter)) logger.info("Wrong member role '{}'".format(filter))
raise Http404("no member role") raise Http404("no member role")

View File

@@ -59,7 +59,7 @@
{% endif %} {% endif %}
<li><a class="button header-btn header-link" href="{% url 'posts:posts.index' %}">News</a></li> <li><a class="button header-btn header-link" href="{% url 'posts:posts.index' %}">News</a></li>
<!-- show active members first --> <!-- 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 '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 'blackboard' %}">Blackboard</a></li>
<li><a class="button header-btn header-link" href="{% url 'contact' %}">Kontakt</a></li> <li><a class="button header-btn header-link" href="{% url 'contact' %}">Kontakt</a></li>

View File

@@ -23,7 +23,7 @@
{% endfor %} {% endfor %}
<div class="cell large-2 medium-4 small-6"> <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 Pension
</a> </a>
</div> </div>