From 2709b6d49494443cfeff6f52df71cd4bf4719dda Mon Sep 17 00:00:00 2001
From: Jonathan Weth <git@jonathanweth.de>
Date: Sat, 18 Jan 2020 14:02:47 +0100
Subject: [PATCH] Add support for new path_and_rename from core_helpers
---
aleksis/apps/mensa/models.py | 4 ++--
aleksis/apps/mensa/views.py | 5 ++++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/aleksis/apps/mensa/models.py b/aleksis/apps/mensa/models.py
index 8658775..e9b8f49 100644
--- a/aleksis/apps/mensa/models.py
+++ b/aleksis/apps/mensa/models.py
@@ -1,14 +1,14 @@
from django.db import models
# Create your models here.
-from aleksis.core.util.helper import path_and_rename
+from aleksis.core.util.core_helpers import path_and_rename
from django.utils.translation import gettext_lazy as _
class Menu(models.Model):
calendar_week = models.IntegerField(verbose_name=_("CW"))
year = models.IntegerField(verbose_name=_("Year"))
- pdf = models.FileField(upload_to=path_and_rename, verbose_name=_("PDF"))
+ pdf = models.FileField(upload_to=lambda a, b: path_and_rename(a, b, upload_to="menu"), verbose_name=_("PDF"))
class Meta:
unique_together = ("calendar_week", "year")
diff --git a/aleksis/apps/mensa/views.py b/aleksis/apps/mensa/views.py
index e615c54..3b257f1 100644
--- a/aleksis/apps/mensa/views.py
+++ b/aleksis/apps/mensa/views.py
@@ -10,6 +10,8 @@ from django.utils import timezone
from .models import Menu
from .settings import BASE_DIR
from .forms import MenuUploadForm
+from aleksis.core.util import messages
+from django.utils.translation import gettext_lazy as _
@login_required
@@ -20,7 +22,8 @@ def upload(request):
if form.is_valid():
form.save()
- return redirect('menu_index_msg', msg="success")
+ messages.success(request, _("The menu was uploaded successfully."))
+ return redirect('menu_index')
else:
form = MenuUploadForm()
return render(request, 'mensa/upload.html', {
--
GitLab