Create new permission groups and fix member register permissions

webapp/management/commands/initialize.py

@@ -50,36 +50,16 @@ class Command(BaseCommand):
             self.stdout.write('The group "officials" already existed '
                               'and was not therefore created')
 
-        feed_permissions = Permission.objects.filter(codename__contains='feed')
+        cts = ContentType.objects.filter(app_label='webapp')
+        feed_permissions = Permission.objects.filter(content_type__in=cts, codename__contains='feed')
+        event_permissions = Permission.objects.filter(content_type__in=cts, codename__contains='event')
+        registration_permissions = Permission.objects.filter(content_type__in=cts, codename__contains='registration')
+
         officials_group.permissions.add(*feed_permissions)
+        officials_group.permissions.add(*event_permissions)
+        officials_group.permissions.add(*registration_permissions)
 
     def handle(self, *args, **options):
-
-        self.stdout.write("Creating sikadmin group")
-        sikadmin_group, created = Group.objects.get_or_create(name="sikadmin")
-        if not created:
-            self.stdout.write('The group "sikadmin" already existed '
-                              'and was not therefore created')
-
-        self.stdout.write("Creating sikadmin permission")
-
-        # TODO Use some sikadmin native model when such exists
-        group_ctype = ContentType.objects.get_for_model(Group)
-        sikadmin_permission, created = Permission.objects.get_or_create(
-            codename='sikadmin',
-            content_type=group_ctype,
-            name='SIK Admin')
-
-        if not created:
-            self.stdout.write('The permission "sikadmin" already existed '
-                              'and was not therefore created')
-
-        self.stdout.write("Giving sikadmin group permission to sikadmin")
-        if sikadmin_group.permissions.filter(id=sikadmin_permission.id).exists():
-            self.stdout.write("Permission already existed. skipping...")
-        else:
-            sikadmin_group.permissions.add(sikadmin_permission)
-
         self.create_infoscreen_moderator()
         self.create_member_register_viewer()
         self.create_member_register_administrator()