From 2a84050c0136dc836355bacc96ba87b0f4564d10 Mon Sep 17 00:00:00 2001
From: Jonathan Weth <git@jonathanweth.de>
Date: Wed, 17 Jun 2020 22:52:22 +0200
Subject: [PATCH] Fix order of has_perm and perm check in lesson template
---
.../alsijil/templates/alsijil/class_register/lesson.html | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html b/aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html
index 3bc8e4468..5cbcd655c 100644
--- a/aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html
+++ b/aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html
@@ -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">
--
GitLab