From 1da526135dc13c5ee56d82d45121d26d792b0509 Mon Sep 17 00:00:00 2001
From: Jonathan Weth <git@jonathanweth.de>
Date: Thu, 30 Jan 2020 19:08:51 +0100
Subject: [PATCH] Improve url configuration for substitutions print view
---
aleksis/apps/chronos/templates/chronos/substitutions.html | 2 +-
aleksis/apps/chronos/urls.py | 4 ++--
aleksis/apps/chronos/views.py | 4 +---
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/aleksis/apps/chronos/templates/chronos/substitutions.html b/aleksis/apps/chronos/templates/chronos/substitutions.html
index 0e1edcd4..32e98c56 100644
--- a/aleksis/apps/chronos/templates/chronos/substitutions.html
+++ b/aleksis/apps/chronos/templates/chronos/substitutions.html
@@ -18,7 +18,7 @@
</div>
<div class="col s2 m6 right align-right print-icon">
<a class="waves-effect waves-teal btn-flat btn-flat-medium right"
- href="{% url "substitutions_print_by_date" day.year day.month day.day "print" %}" target="_blank">
+ href="{% url "substitutions_print_by_date" day.year day.month day.day %}" target="_blank">
<i class="material-icons center">print</i>
</a>
</div>
diff --git a/aleksis/apps/chronos/urls.py b/aleksis/apps/chronos/urls.py
index 16457090..d5311f49 100644
--- a/aleksis/apps/chronos/urls.py
+++ b/aleksis/apps/chronos/urls.py
@@ -22,7 +22,7 @@ urlpatterns = [
name="delete_substitution",
),
path("substitutions/", views.substitutions, name="substitutions"),
- path("substitutions/<str:is_print>/", views.substitutions, name="substitutions_print"),
+ path("substitutions/print/", views.substitutions, {"is_print": True}, name="substitutions_print"),
path("substitutions/<int:year>/<int:month>/<int:day>/", views.substitutions, name="substitutions_by_date"),
- path("substitutions/<int:year>/<int:month>/<int:day>/<str:is_print>/", views.substitutions, name="substitutions_print_by_date"),
+ path("substitutions/<int:year>/<int:month>/<int:day>/print/", views.substitutions, {"is_print": True}, name="substitutions_print_by_date"),
]
diff --git a/aleksis/apps/chronos/views.py b/aleksis/apps/chronos/views.py
index 32de5b6e..388307c0 100644
--- a/aleksis/apps/chronos/views.py
+++ b/aleksis/apps/chronos/views.py
@@ -299,12 +299,10 @@ def substitutions(
year: Optional[int] = None,
month: Optional[int] = None,
day: Optional[int] = None,
- is_print: Optional[str] = None,
+ is_print: bool = False,
) -> HttpResponse:
context = {}
- is_print = is_print == "print"
-
if day:
wanted_day = timezone.datetime(year=year, month=month, day=day).date()
wanted_day = get_next_relevant_day(wanted_day)
--
GitLab