diff --git a/aleksis/apps/chronos/templates/chronos/substitutions.html b/aleksis/apps/chronos/templates/chronos/substitutions.html index 0e1edcd4a12bbe82772c8a7db46c5d62c7400a58..32e98c56d705fc815f709a7cbcc063c5206cb191 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 16457090454d73a5ee6f98269903e53bfcd65e04..d5311f492f6592dfb66f4fa5b03b48fc76126188 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 32de5b6efbf6a572a4a8977ccfbdded1a5553470..388307c0a01ba3bcde067d456ea41b6348ed1223 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)