From 76804d6c2a6d2e231ff983cd615fb450526897ad Mon Sep 17 00:00:00 2001 From: Patrick Mayr Date: Mon, 21 Nov 2022 13:43:26 +0000 Subject: [PATCH] change jobs to section and blackboard to jobs --- fet2020/fet2020/urls.py | 7 ++----- fet2020/members/models.py | 6 +++--- fet2020/members/urls.py | 14 ++++---------- fet2020/members/views.py | 9 ++++----- fet2020/templates/base.html | 4 ++-- fet2020/templates/blackboard/index.html | 4 ++-- fet2020/templates/members/index.html | 8 ++++---- .../templates/members/partials/_jobs_side_bar.html | 2 +- 8 files changed, 22 insertions(+), 32 deletions(-) diff --git a/fet2020/fet2020/urls.py b/fet2020/fet2020/urls.py index 457ba3fd..9af7f0f5 100644 --- a/fet2020/fet2020/urls.py +++ b/fet2020/fet2020/urls.py @@ -8,7 +8,6 @@ from django.urls import include, path, re_path from django.views.generic import RedirectView from posts.viewsets import PostViewSet -from members.urls import jobs_urlpatterns, member_urlpatterns from members.viewsets import ( MemberViewSet, JobViewSet, @@ -28,18 +27,16 @@ router.register(r"jobmembers", JobMemberViewSet) urlpatterns = [ path("", views.index, name="home"), + path("", include("members.urls")), path("admin/doc/", include("django.contrib.admindocs.urls")), path("admin/login/", RedirectView.as_view(pattern_name="authentications:login")), path("admin/", admin.site.urls), path("auth/", include("authentications.urls")), path("api/", include(router.urls)), - path("blackboard/", include("blackboard.urls")), path("ckeditor/", include("ckeditor_uploader.urls")), path("gallery/", include("gallery.urls")), path("intern/", include("intern.urls")), - path("jobs/", include(jobs_urlpatterns)), - path("members/", include("members.urls")), - path("member/", include(member_urlpatterns)), + path("jobs/", include("blackboard.urls")), path("posts/", include("posts.urls")), path("search/", include("search.urls")), path("tasks/", include("tasks.urls")), diff --git a/fet2020/members/models.py b/fet2020/members/models.py index 2ecd1ff4..175b29d6 100644 --- a/fet2020/members/models.py +++ b/fet2020/members/models.py @@ -87,7 +87,7 @@ class Member(models.Model): # need to have 'View on site' link in admin app def get_absolute_url(self): - return reverse("member", kwargs={"member_id": self.id}) + return reverse("members:member", kwargs={"member_id": self.id}) def clean(self): if not self.image: @@ -126,7 +126,7 @@ class JobGroup(models.Model): # need to have 'View on site' link in admin app def get_absolute_url(self): - return reverse("jobs", kwargs={"slug": self.slug}) + return reverse("members:jobs", kwargs={"slug": self.slug}) def clean(self): if not self.shortterm: @@ -157,7 +157,7 @@ class Job(models.Model): return self.name def get_absolute_url(self): - return reverse("jobs", kwargs={"slug": self.job_group.slug}) + "#" + self.slug + return reverse("members:jobs", kwargs={"slug": self.job_group.slug}) + "#" + self.slug def clean(self): if not self.shortterm: diff --git a/fet2020/members/urls.py b/fet2020/members/urls.py index b1094a76..e3aeed68 100644 --- a/fet2020/members/urls.py +++ b/fet2020/members/urls.py @@ -6,14 +6,8 @@ from . import views app_name = apps.MembersConfig.name urlpatterns = [ - path("", views.index, name="index"), - path("/", views.members, name="members"), -] - -member_urlpatterns = [ - path("/", views.profile, name="member"), -] - -jobs_urlpatterns = [ - path("/", views.jobs, name="jobs"), + path("members/", views.index, name="index"), + path("members//", views.members, name="members"), + path("member//", views.profile, name="member"), + path("section//", views.jobs, name="jobs"), ] diff --git a/fet2020/members/views.py b/fet2020/members/views.py index efa3a3e3..16fa3b0d 100644 --- a/fet2020/members/views.py +++ b/fet2020/members/views.py @@ -23,7 +23,7 @@ def __get_job_groups(): def index(request): job_groups = __get_job_groups() - members = Member.all_members.all() + members = Member.all_members.filter(role=Member.MemberRole.ACTIVE) context = { "job_groups": job_groups, @@ -55,16 +55,15 @@ def jobs(request, slug=None): return render(request, "members/jobs.html", context) -def members(request, filter=None): +def members(request, role=None): job_groups = __get_job_groups() for elem in Member.MemberRole: - if filter == elem.label.lower(): + if role == elem.label.lower(): members = Member.all_members.filter(role=elem.value) break else: - logger.info("Wrong member role '{}'".format(filter)) - raise Http404("no member role") + members = Member.all_members.all() context = { "job_groups": job_groups, diff --git a/fet2020/templates/base.html b/fet2020/templates/base.html index 29a39eaa..d1a9fa4e 100644 --- a/fet2020/templates/base.html +++ b/fet2020/templates/base.html @@ -58,9 +58,9 @@
    {% endif %}
  • News
    • -
  • Fachschaft
    • +
  • Fachschaft
  • Galerie
    • -
  • Blackboard
    • +
  • Jobs
    • {% get_flatpages '/kontakt/' as pages %} {% if pages %} diff --git a/fet2020/templates/blackboard/index.html b/fet2020/templates/blackboard/index.html index f91e9b0d..7a14db6c 100644 --- a/fet2020/templates/blackboard/index.html +++ b/fet2020/templates/blackboard/index.html @@ -2,12 +2,12 @@ {% load flatpages %} -{% block title %}Blackboard{% endblock %} +{% block title %}Jobs{% endblock %} {% block content %}
    -

    Blackboard

    +

    Jobs

    {% get_flatpages '/blackboard-info/' as bb_infos %} diff --git a/fet2020/templates/members/index.html b/fet2020/templates/members/index.html index b180ad6e..70d6ddd8 100644 --- a/fet2020/templates/members/index.html +++ b/fet2020/templates/members/index.html @@ -47,16 +47,16 @@
    -
  • - Fachschaft +
  • + Fachschaft
  • Pension
    • -
  • - Alle Mitglieder +
  • + Alle Mitglieder
    • {% if request.user.is_authenticated %} diff --git a/fet2020/templates/members/partials/_jobs_side_bar.html b/fet2020/templates/members/partials/_jobs_side_bar.html index 4e10986a..ab4e513e 100644 --- a/fet2020/templates/members/partials/_jobs_side_bar.html +++ b/fet2020/templates/members/partials/_jobs_side_bar.html @@ -1,5 +1,5 @@
  • - {{ job.name }} + {{ job.name }}
    • {% if job.slug == active_job_group.slug %}