From 465f51decc8cb22326c51eac4ef639ee913fd474 Mon Sep 17 00:00:00 2001
From: Tom Teichler <tom.teichler@teckids.org>
Date: Mon, 30 Sep 2019 18:40:49 +0200
Subject: [PATCH] FUlly rename view.
---
biscuit/apps/alsijil/menus.py | 2 +-
.../templates/alsijil/{group_week.html => week_view.html} | 0
biscuit/apps/alsijil/urls.py | 6 +++---
biscuit/apps/alsijil/views.py | 8 ++++----
4 files changed, 8 insertions(+), 8 deletions(-)
rename biscuit/apps/alsijil/templates/alsijil/{group_week.html => week_view.html} (100%)
diff --git a/biscuit/apps/alsijil/menus.py b/biscuit/apps/alsijil/menus.py
index 32c08208e..b53893561 100644
--- a/biscuit/apps/alsijil/menus.py
+++ b/biscuit/apps/alsijil/menus.py
@@ -15,7 +15,7 @@ MENUS = {
},
{
'name': _('Current week'),
- 'url': 'group_week',
+ 'url': 'week_view',
'validators': ['menu_generator.validators.is_authenticated']
}
]
diff --git a/biscuit/apps/alsijil/templates/alsijil/group_week.html b/biscuit/apps/alsijil/templates/alsijil/week_view.html
similarity index 100%
rename from biscuit/apps/alsijil/templates/alsijil/group_week.html
rename to biscuit/apps/alsijil/templates/alsijil/week_view.html
diff --git a/biscuit/apps/alsijil/urls.py b/biscuit/apps/alsijil/urls.py
index a87e088bc..cf0aa8cf4 100644
--- a/biscuit/apps/alsijil/urls.py
+++ b/biscuit/apps/alsijil/urls.py
@@ -7,9 +7,9 @@ urlpatterns = [
path('lesson', views.lesson, name='lesson'),
path('lesson/<int:year>/<int:week>/<int:period_id>', views.lesson,
name='lesson_by_week_and_period'),
- path('group/week', views.group_week, name='group_week'),
- path('group/week/<int:year>/<int:week>', views.group_week,
- name='group_week_by_week'),
+ path('group/week', views.week_view, name='week_view'),
+ path('group/week/<int:year>/<int:week>', views.week_view,
+ name='week_view_by_week'),
path('print/group/<int:id_>', views.full_register_group,
name='full_register_group')
]
diff --git a/biscuit/apps/alsijil/views.py b/biscuit/apps/alsijil/views.py
index 94222edc5..a3eea8ae7 100644
--- a/biscuit/apps/alsijil/views.py
+++ b/biscuit/apps/alsijil/views.py
@@ -90,7 +90,7 @@ def lesson(request: HttpRequest, year: Optional[int] = None, week: Optional[int]
@login_required
-def group_week(request: HttpRequest, year: Optional[int] = None, week: Optional[int] = None) -> HttpResponse:
+def week_view(request: HttpRequest, year: Optional[int] = None, week: Optional[int] = None) -> HttpResponse:
context = {}
if year and week:
@@ -178,11 +178,11 @@ def group_week(request: HttpRequest, year: Optional[int] = None, week: Optional[
week_prev = wanted_week - 1
week_next = wanted_week + 1
- context['url_prev'] = '%s?%s' % (reverse('group_week_by_week', args=[week_prev.year, week_prev.week]), request.GET.urlencode())
- context['url_next'] = '%s?%s' % (reverse('group_week_by_week', args=[week_next.year, week_next.week]), request.GET.urlencode())
+ context['url_prev'] = '%s?%s' % (reverse('week_view_by_week', args=[week_prev.year, week_prev.week]), request.GET.urlencode())
+ context['url_next'] = '%s?%s' % (reverse('week_view_by_week', args=[week_next.year, week_next.week]), request.GET.urlencode())
- return render(request, 'alsijil/group_week.html', context)
+ return render(request, 'alsijil/week_view.html', context)
@login_required
--
GitLab