Merge branch 'master' into 116-automatically-create-a-pdf-file-of-the-substitution-plan

CHANGELOG.rst

@@ -14,6 +14,14 @@ Added
 
 * Add support for automatically generating PDF files of substitutions plans on data changes.
 
+`2.0rc2`_ - 2021-08-01
+----------
+
+Fixed
+~~~~~
+
+* Drop usage of non-existing permission in permission rules for lesson substitutions.
+
 `2.0rc1`_ - 2021-06-23
 ----------------------
 
@@ -193,8 +201,6 @@ Fixed
 .. _2.0b0: https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos/-/tags/2.0b0
 .. _2.0b1: https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos/-/tags/2.0b1
 .. _2.0b2: https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos/-/tags/2.0b2
-<<<<<<< HEAD
-=======
 .. _2.0b3: https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos/-/tags/2.0b3
 .. _2.0rc1: https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos/-/tags/2.0rc1
->>>>>>> e039025 (Update the changelog for 2.0rc1)
+.. _2.0rc2: https://edugit.org/AlekSIS/Official/AlekSIS-App-Chronos/-/tags/2.0rc2

aleksis/apps/chronos/rules.py

@@ -44,7 +44,7 @@ add_perm("chronos.delete_substitution_rule", delete_substitution_predicate)
 # View substitutions
 view_substitutions_predicate = has_person & (
     has_global_perm("chronos.view_lessonsubstitution")
-    | has_any_object("chronos.view_lessonsubstitution_rule", LessonSubstitution)
+    | has_any_object("chronos.view_lessonsubstitution", LessonSubstitution)
 )
 add_perm("chronos.view_substitutions_rule", view_substitutions_predicate)