Merge branch 'fix-permissions' into 'master'

Fix GlobalPermissionModel

See merge request !172

aleksis/apps/alsijil/migrations/0008_global_permissions.py

@@ -17,6 +17,7 @@ class Migration(migrations.Migration):
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('extended_data', models.JSONField(default=dict, editable=False)),
             ],
+            "default_permissions": (),
             options={
                 'permissions': (('view_week', 'Can view week overview'), ('register_absence', 'Can register absence'), ('list_personal_note_filters', 'Can list all personal note filters')),
                 'managed': False,

aleksis/apps/alsijil/models.py

@@ -31,7 +31,7 @@ from aleksis.apps.alsijil.managers import (
 from aleksis.apps.chronos.managers import GroupPropertiesMixin
 from aleksis.apps.chronos.mixins import WeekRelatedMixin
 from aleksis.apps.chronos.models import Event, ExtraLesson, LessonPeriod
-from aleksis.core.mixins import ExtensibleModel
+from aleksis.core.mixins import ExtensibleModel, GlobalPermissionModel
 from aleksis.core.models import SchoolTerm
 from aleksis.core.util.core_helpers import get_site_preferences
 from aleksis.core.util.model_helpers import ICONS
@@ -420,7 +420,7 @@ class GroupRoleAssignment(GroupPropertiesMixin, ExtensibleModel):
         verbose_name_plural = _("Group role assignments")
 
 
-class AlsijilGlobalPermissions(ExtensibleModel):
+class AlsijilGlobalPermissions(GlobalPermissionModel):
     class Meta:
         managed = False
         permissions = (