Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-Core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor 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-Core
Commits
e494cf7c
Commit
e494cf7c
authored
6 years ago
by
Jonathan Weth
Browse files
Options
Downloads
Patches
Plain Diff
Bug fixing
parent
11d0a9f2
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!86
Merge school-apps
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
schoolapps/menu/views.py
+3
-0
3 additions, 0 deletions
schoolapps/menu/views.py
schoolapps/templates/partials/header.html
+1
-1
1 addition, 1 deletion
schoolapps/templates/partials/header.html
with
4 additions
and
1 deletion
schoolapps/menu/views.py
+
3
−
0
View file @
e494cf7c
import
datetime
import
os
from
django.contrib.auth.decorators
import
login_required
,
permission_required
from
django.http
import
FileResponse
from
django.shortcuts
import
render
,
redirect
from
django.utils
import
timezone
...
...
@@ -9,6 +10,8 @@ from menu.models import Menu
from
.forms
import
MenuUploadForm
@login_required
@permission_required
(
"
can_add_menu
"
)
def
upload
(
request
):
if
request
.
method
==
'
POST
'
:
form
=
MenuUploadForm
(
request
.
POST
,
request
.
FILES
)
...
...
This diff is collapsed.
Click to expand it.
schoolapps/templates/partials/header.html
+
1
−
1
View file @
e494cf7c
...
...
@@ -122,7 +122,7 @@
<div
class=
"divider"
></div>
</li>
{% endif %}
{% if perms.mealplan.can_add_me
alpla
n %}
{% if perms.mealplan.can_add_men
u
%}
<li>
<a
class=
"subheader grey lighten-3"
>
Speiseplan
</a>
</li>
...
...
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