Merge branch '194-add-missing-definitions-of-global-permissions' into 'master'

Resolve "Add missing definitions of global permissions"

Closes #194

See merge request AlekSIS/official/AlekSIS-App-Alsijil!243

CHANGELOG.rst

@@ -17,6 +17,7 @@ Fixed
 * Subjects in full register printout were struck through although they
 hadn't changed.
 *  Table with all register objects didn't work with extra lessons.
+* Add missing definitions of some permissions so they can be assigned.
 
 `2.0rc6`_ - 2021-08-25
 ----------------------

aleksis/apps/alsijil/model_extensions.py

@@ -206,6 +206,7 @@ Group.add_permission("view_full_register_group", _("Can view full register of a
 Group.add_permission(
     "register_absence_group", _("Can register an absence for all members of a group")
 )
+Group.add_permission("assign_grouprole", _("Can assign a group role for this group"))
 Person.add_permission("register_absence_person", _("Can register an absence for a person"))
 
 

aleksis/apps/alsijil/models.py

@@ -445,6 +445,7 @@ class GroupRole(ExtensibleModel):
         constraints = [
             models.UniqueConstraint(fields=("site_id", "name"), name="unique_role_per_site"),
         ]
+        permissions = (("assign_group_role", _("Can assign group role")),)
 
 
 class GroupRoleAssignment(GroupPropertiesMixin, ExtensibleModel):
@@ -495,7 +496,9 @@ class AlsijilGlobalPermissions(GlobalPermissionModel):
     class Meta:
         managed = False
         permissions = (
+            ("view_lesson", _("Can view lesson overview")),
             ("view_week", _("Can view week overview")),
+            ("view_full_register", _("Can view full register")),
             ("register_absence", _("Can register absence")),
             ("list_personal_note_filters", _("Can list all personal note filters")),
         )

aleksis/apps/alsijil/rules.py

@@ -192,7 +192,7 @@ add_perm(
 # Edit person overview personal notes
 edit_person_overview_personal_notes_predicate = view_person_overview_predicate & (
     ~is_current_person
-    | has_global_perm("alsijil.edit_personalnote")
+    | has_global_perm("alsijil.change_personalnote")
     | has_person_group_object_perm("core.edit_personalnote_group")
 )
 add_perm(
@@ -307,6 +307,6 @@ add_perm("alsijil.delete_grouproleassignment_rule", delete_group_role_assignment
 
 view_register_objects_list_predicate = has_person & (
     has_any_object("core.view_full_register_group", Group)
-    | has_global_perm("core.view_full_register")
+    | has_global_perm("alsijil.view_full_register")
 )
 add_perm("alsijil.view_register_objects_list_rule", view_register_objects_list_predicate)