Skip to content
Snippets Groups Projects
Commit 3070497e authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Merge branch '225-seating-plan-integration-uses-wrong-permission-names' into 'master'

Resolve "Seating plan integration uses wrong permission names"

Closes #225

See merge request !302
parents ed3002e7 bafbf89a
No related branches found
No related tags found
1 merge request!302Resolve "Seating plan integration uses wrong permission names"
Pipeline #86852 canceled
...@@ -17,6 +17,7 @@ Fixed ...@@ -17,6 +17,7 @@ Fixed
* Data checks reported all Lesson Documentations as being during Holidays if there was no Holiday object. * Data checks reported all Lesson Documentations as being during Holidays if there was no Holiday object.
* Students were displayed multiple times in class register views. * Students were displayed multiple times in class register views.
* Absences were counted multiple times in some class register views. * Absences were counted multiple times in some class register views.
* Group owners couldn't create new seating plans.
`2.1`_ - 2022-06-25 `2.1`_ - 2022-06-25
------------------- -------------------
......
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
<i class="material-icons left small orange-text">warning</i> <i class="material-icons left small orange-text">warning</i>
{% trans "There is no seating plan for this lesson." %} {% trans "There is no seating plan for this lesson." %}
</div> </div>
{% has_perm "stoelindeling.add_seatingplan_rule" user first_group as can_add %} {% has_perm "stoelindeling.create_seatingplan_rule" user first_group as can_add %}
{% if can_add %} {% if can_add %}
<div class="row margin-bottom"> <div class="row margin-bottom">
<div class="col s12"> <div class="col s12">
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
</div> </div>
{% endif %} {% endif %}
{% for parent_group in first_group.parent_groups.all %} {% for parent_group in first_group.parent_groups.all %}
{% has_perm "stoelindeling.add_seatingplan_rule" user parent_group as can_add %} {% has_perm "stoelindeling.create_seatingplan_rule" user parent_group as can_add %}
{% if can_add %} {% if can_add %}
<div class="row"> <div class="row">
<div class="col s12"> <div class="col s12">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment