From 604bf2bc9054461d421b64fc90edb7e91c957d1d Mon Sep 17 00:00:00 2001 From: Jonathan Weth <git@jonathanweth.de> Date: Sat, 18 Jan 2020 14:10:11 +0100 Subject: [PATCH] Remove legacy message support --- aleksis/apps/mensa/templates/mensa/index.html | 5 ----- aleksis/apps/mensa/views.py | 8 ++++---- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/aleksis/apps/mensa/templates/mensa/index.html b/aleksis/apps/mensa/templates/mensa/index.html index 3edb662..6ed0718 100644 --- a/aleksis/apps/mensa/templates/mensa/index.html +++ b/aleksis/apps/mensa/templates/mensa/index.html @@ -2,11 +2,6 @@ {% load msg_box %} {% block content %} - {% if msg == "success" %} - {% msg_box "Der Speiseplan wurde erfolgreich hochgeladen." "success" "check_circle" %} - {% elif msg == "delete_success" %} - {% msg_box "Der Speiseplan wurde erfolgreich gelöscht." "success" "check_circle" %} - {% endif %} <script type="text/javascript"> $('#alert_close').click(function () { $("#alert_box").fadeOut("slow", function () { diff --git a/aleksis/apps/mensa/views.py b/aleksis/apps/mensa/views.py index 3b257f1..2367423 100644 --- a/aleksis/apps/mensa/views.py +++ b/aleksis/apps/mensa/views.py @@ -34,17 +34,17 @@ def upload(request): @login_required @permission_required("mensa.add_menu") def delete(request, id): - # print(id) Menu.objects.get(id=id).delete() - return redirect("menu_index_msg", msg="delete_success") + messages.success(request, _("The menu was deleted successfully.")) + return redirect("menu_index") @login_required @permission_required("menu.add_menu") -def index(request, msg=None): +def index(request): menus = Menu.objects.all().order_by("calendar_week", "year") - return render(request, 'mensa/index.html', {"msg": msg, "menus": menus}) + return render(request, 'mensa/index.html', {"menus": menus}) def return_pdf(filename): -- GitLab