Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-App-Alsijil
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
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-Alsijil
Merge requests
!49
Resolve "Add rules and permissions"
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Resolve "Add rules and permissions"
73-add-rules-and-permissions
into
master
Overview
72
Commits
106
Pipelines
85
Changes
1
Merged
Jonathan Weth
requested to merge
73-add-rules-and-permissions
into
master
4 years ago
Overview
14
Commits
106
Pipelines
85
Changes
1
Expand
Closes
#73 (closed)
Closes
#79 (closed)
Edited
4 years ago
by
Nik | Klampfradler
0
0
Merge request reports
Viewing commit
2a84050c
Prev
Next
Show latest version
1 file
+
5
−
3
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Verified
2a84050c
Fix order of has_perm and perm check in lesson template
· 2a84050c
Jonathan Weth
authored
4 years ago
aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html
+
5
−
3
Options
@@ -24,6 +24,10 @@
{% endblock %}
{% block content %}
{% has_perm "alsijil.view_lessondocumentation" user lesson_period as can_view_lesson_documentation %}
{% has_perm "alsijil.edit_lessondocumentation" user lesson_period as can_edit_lesson_documentation %}
{% has_perm "alsijil.edit_personalnote" user lesson_period as can_edit_personalnote %}
<form
method=
"post"
>
<div
class=
"row"
>
<div
class=
"col s12"
>
@@ -41,8 +45,7 @@
<span
class=
"card-title"
>
{% blocktrans %}Lesson documentation{% endblocktrans %}
</span>
{% has_perm "alsijil.view_lessondocumentation" user lesson_period as can_view_lesson_documentation %}
{% has_perm "alsijil.edit_lessondocumentation" user lesson_period as can_edit_lesson_documentation %}
{% if can_edit_lesson_documentation %}
{% form form=lesson_documentation_form %}{% endform %}
{% elif can_view_lesson_documentation %}
@@ -90,7 +93,6 @@
<span
class=
"card-title"
>
{% blocktrans %}Personal notes{% endblocktrans %}
</span>
{% has_perm "alsijil.edit_personalnote" user lesson_period as can_edit_personalnote %}
{% form form=personal_note_formset.management_form %}{% endform %}
<table
class=
"striped responsive-table alsijil-table"
>
Loading