Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-App-Resint
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AlekSIS®
Official
AlekSIS-App-Resint
Commits
2709b6d4
Verified
Commit
2709b6d4
authored
5 years ago
by
Jonathan Weth
Browse files
Options
Downloads
Patches
Plain Diff
Add support for new path_and_rename from core_helpers
parent
f28b8f38
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
aleksis/apps/mensa/models.py
+2
-2
2 additions, 2 deletions
aleksis/apps/mensa/models.py
aleksis/apps/mensa/views.py
+4
-1
4 additions, 1 deletion
aleksis/apps/mensa/views.py
with
6 additions
and
3 deletions
aleksis/apps/mensa/models.py
+
2
−
2
View file @
2709b6d4
from
django.db
import
models
# Create your models here.
from
aleksis.core.util.helper
import
path_and_rename
from
aleksis.core.util.
core_
helper
s
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
"
)
...
...
This diff is collapsed.
Click to expand it.
aleksis/apps/mensa/views.py
+
4
−
1
View file @
2709b6d4
...
...
@@ -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
'
,
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment