Merge branch '143-fix-usage-of-user-has_perm-with-object-permissions' into 'master'

Resolve "Fix usage of user.has_perm with object permissions"

Closes #143

See merge request !157

aleksis/apps/alsijil/rules.py

@@ -258,13 +258,21 @@ add_perm("alsijil.delete_grouprole", delete_group_role_predicate)
 
 view_assigned_group_roles_predicate = (
     is_group_owner
-    | is_lesson_teacher
+    | has_global_perm("alsjil.assign_grouprole")
+    | has_object_perm("core.assign_grouprole")
+)
+add_perm("alsijil.view_assigned_grouproles", view_assigned_group_roles_predicate)
+
+view_assigned_group_roles_register_object_predicate = (
+    is_lesson_teacher
     | is_lesson_original_teacher
     | is_lesson_parent_group_owner
     | has_global_perm("alsjil.assign_grouprole")
-    | has_object_perm("alsijil.assign_grouprole")
 )
-add_perm("alsijil.view_assigned_grouproles", view_assigned_group_roles_predicate)
+add_perm(
+    "alsijil.view_assigned_grouproles_for_register_object",
+    view_assigned_group_roles_register_object_predicate,
+)
 
 assign_group_role_person_predicate = is_person_group_owner | has_global_perm(
     "alsjil.assign_grouprole"

aleksis/apps/alsijil/views.py

@@ -167,7 +167,9 @@ def register_object(
         # Group roles
         show_group_roles = request.user.person.preferences[
             "alsijil__group_roles_in_lesson_view"
-        ] and request.user.has_perm("alsijil.view_assigned_grouproles", register_object)
+        ] and request.user.has_perm(
+            "alsijil.view_assigned_grouproles_for_register_object", register_object
+        )
         if show_group_roles:
             groups = register_object.get_groups().all()
             group_roles = GroupRole.objects.with_assignments(date_of_lesson, groups)