From ab17668eb55fcd6a7ffba0d244e22165a450c389 Mon Sep 17 00:00:00 2001
From: Jonathan Weth <git@jonathanweth.de>
Date: Mon, 13 Jan 2020 21:02:23 +0100
Subject: [PATCH] Rename _type to type_
Because leading underscore is reserved for private class members
---
aleksis/apps/chronos/urls.py | 6 +++---
aleksis/apps/chronos/views.py | 16 ++++++++--------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/aleksis/apps/chronos/urls.py b/aleksis/apps/chronos/urls.py
index ff4c1383..a3787c6a 100644
--- a/aleksis/apps/chronos/urls.py
+++ b/aleksis/apps/chronos/urls.py
@@ -4,9 +4,9 @@ from . import views
urlpatterns = [
path("", views.all, name="all_timetables"),
- path("timetable/<str:_type>/<int:pk>/", views.timetable, name="timetable"),
- path("timetable/<str:_type>/<int:pk>/<int:year>/<int:week>/", views.timetable, name="timetable_by_week"),
- path("timetable/<str:_type>/<int:pk>/<str:regular>/", views.timetable, name="timetable_regular"),
+ path("timetable/<str:type_>/<int:pk>/", views.timetable, name="timetable"),
+ path("timetable/<str:type_>/<int:pk>/<int:year>/<int:week>/", views.timetable, name="timetable_by_week"),
+ path("timetable/<str:type_>/<int:pk>/<str:regular>/", views.timetable, name="timetable_regular"),
path("lessons/", views.lessons_day, name="lessons_day"),
path("lessons/<when>/", views.lessons_day, name="lessons_day_by_date"),
path(
diff --git a/aleksis/apps/chronos/views.py b/aleksis/apps/chronos/views.py
index 817eff8e..cc3c6da8 100644
--- a/aleksis/apps/chronos/views.py
+++ b/aleksis/apps/chronos/views.py
@@ -79,17 +79,17 @@ def all(request: HttpRequest) -> HttpResponse:
@login_required
def timetable(
- request: HttpRequest, _type: str, pk: int, year: Optional[int] = None, week: Optional[int] = None, regular: Optional[str] = None
+ request: HttpRequest, type_: str, pk: int, year: Optional[int] = None, week: Optional[int] = None, regular: Optional[str] = None
) -> HttpResponse:
context = {}
is_smart = regular != "regular"
- if _type == "group":
+ if type_ == "group":
el = get_object_or_404(Group, pk=pk)
- elif _type == "teacher":
+ elif type_ == "teacher":
el = get_object_or_404(Person, pk=pk)
- elif _type == "room":
+ elif type_ == "room":
el = get_object_or_404(Room, pk=pk)
else:
return HttpResponseNotFound()
@@ -101,7 +101,7 @@ def timetable(
wanted_week = CalendarWeek()
lesson_periods = LessonPeriod.objects.in_week(wanted_week)
- lesson_periods = lesson_periods.filter_from_type(_type, pk)
+ lesson_periods = lesson_periods.filter_from_type(type_, pk)
# else:
# # Redirect to a selected view if no filter provided
# if request.user.person:
@@ -153,7 +153,7 @@ def timetable(
context["weekdays_short"] = dict(TimePeriod.WEEKDAY_CHOICES_SHORT[weekday_min_:weekday_max + 1])
context["weeks"] = get_weeks_for_year(year=wanted_week.year)
context["week"] = wanted_week
- context["type"] = _type
+ context["type"] = type_
context["pk"] = pk
context["el"] = el
context["smart"] = is_smart
@@ -161,8 +161,8 @@ def timetable(
week_prev = wanted_week - 1
week_next = wanted_week + 1
- context["url_prev"] = reverse("timetable_by_week", args=[_type, pk, week_prev.year, week_prev.week])
- context["url_next"] = reverse("timetable_by_week", args=[_type, pk, week_next.year, week_next.week])
+ context["url_prev"] = reverse("timetable_by_week", args=[type_, pk, week_prev.year, week_prev.week])
+ context["url_next"] = reverse("timetable_by_week", args=[type_, pk, week_next.year, week_next.week])
return render(request, "chronos/plan.html", context)
--
GitLab