Merge branch 'add-missing-permission' into 'master'

Add missing permission

See merge request !925

CHANGELOG.rst

@@ -27,6 +27,11 @@ Fixed
 * The menu item for entering an invitation code received offline was missing
 * CleaveJS was not loaded properly when using an external CDN
 
+Changed
+-------
+
+* Allow non-superusers with permission to invite persons
+
 `2.6`_ - 2022-01-10
 -------------------
 

aleksis/core/migrations/0034_invite_permission.py

+# Generated by Django 3.2.11 on 2022-01-22 20:18
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0033_update_photo_avatar'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='globalpermissions',
+            options={'default_permissions': (), 'managed': False, 'permissions': (('view_system_status', 'Can view system status'), ('manage_data', 'Can manage data'), ('impersonate', 'Can impersonate'), ('search', 'Can use search'), ('change_site_preferences', 'Can change site preferences'), ('change_person_preferences', 'Can change person preferences'), ('change_group_preferences', 'Can change group preferences'), ('test_pdf', 'Can test PDF generation'), ('invite', 'Can invite persons'))},
+        ),
+    ]

aleksis/core/models.py

@@ -1060,6 +1060,7 @@ class GlobalPermissions(GlobalPermissionModel):
             ("change_person_preferences", _("Can change person preferences")),
             ("change_group_preferences", _("Can change group preferences")),
             ("test_pdf", _("Can test PDF generation")),
+            ("invite", _("Can invite persons")),
         )
 
 

aleksis/core/rules.py

@@ -329,6 +329,9 @@ rules.add_perm("core.can_change_password", can_change_password_predicate)
 invite_enabled_predicate = is_site_preference_set(section="auth", pref="invite_enabled")
 rules.add_perm("core.invite_enabled", invite_enabled_predicate)
 
+can_invite_predicate = has_person & has_global_perm("core.invite")
+rules.add_perm("core.can_invite", can_invite_predicate)
+
 # OAuth2 permissions
 create_oauthapplication_predicate = has_person & has_global_perm("core.add_oauthapplication")
 rules.add_perm("core.create_oauthapplication_rule", create_oauthapplication_predicate)