diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 9cecd236f4ab724a72760b000d52fe18f65d2b29..d46b1ce3f57dfd37544ba1f8f67745c61b3f3d1e 100644 --- a/CHANGELOG.rst +++ b/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 ---------------------- diff --git a/aleksis/apps/alsijil/model_extensions.py b/aleksis/apps/alsijil/model_extensions.py index 72c4b02f979cb80047467545bfdb65bbbf050fac..53578423acef155008417d3fd9d50b896f13d5e4 100644 --- a/aleksis/apps/alsijil/model_extensions.py +++ b/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")) diff --git a/aleksis/apps/alsijil/models.py b/aleksis/apps/alsijil/models.py index d00f083010ef0ce421e6e2c3124e95014be5eb84..1805831a1b25cbe01744f9a3a7e7a2baf7f27966 100644 --- a/aleksis/apps/alsijil/models.py +++ b/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")), ) diff --git a/aleksis/apps/alsijil/rules.py b/aleksis/apps/alsijil/rules.py index 0eca2b8c08d95e7a025cd58cf9eb1b83557c1f8e..23686bf17d9e2f54a95bc26c672cc4a046ba0131 100644 --- a/aleksis/apps/alsijil/rules.py +++ b/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)