diff --git a/members/migrations/0018_auto_20170927_1918.py b/members/migrations/0018_auto_20170927_1918.py new file mode 100644 index 0000000..43f01be --- /dev/null +++ b/members/migrations/0018_auto_20170927_1918.py @@ -0,0 +1,27 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11 on 2017-09-27 16:18 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('members', '0017_auto_20170926_1316'), + ] + + operations = [ + migrations.AlterModelOptions( + name='member', + options={'permissions': (('check_by_email', 'Can check if user exists by email'), ('read', 'Can see member in list'))}, + ), + migrations.AlterModelOptions( + name='payment', + options={'permissions': (('read', 'Can see payment in list'),)}, + ), + migrations.AlterModelOptions( + name='request', + options={'permissions': (('read', 'Can see member application in list'),)}, + ), + ] diff --git a/members/models.py b/members/models.py index 7e4d7ea..2a0337d 100644 --- a/members/models.py +++ b/members/models.py @@ -43,6 +43,11 @@ class BaseMember(models.Model): class Request(BaseMember): """Member request model represents one member request.""" + class Meta: + permissions = ( + ('read', 'Can see member application in list'), + ) + submitted = models.DateTimeField(_('Submitted'), default=timezone.now) def to_member(self): @@ -55,6 +60,11 @@ class Request(BaseMember): class Payment(models.Model): """Payment model representing one payment event.""" + class Meta: + permissions = ( + ('read', 'Can see payment in list'), + ) + date = models.DateTimeField(_('Date'), default=timezone.now) source = models.CharField(_('Source'), choices=[ ('AYY', _('AYY')), @@ -88,6 +98,7 @@ class Member(BaseMember): class Meta: permissions = ( ('check_by_email', 'Can check if user exists by email'), + ('read', 'Can see member in list'), ) def last_paid(self): diff --git a/webapp/admin.py b/webapp/admin.py index 03faf69..b0b4349 100644 --- a/webapp/admin.py +++ b/webapp/admin.py @@ -6,10 +6,12 @@ from webapp.models import Feed, Tag, BaseFeed, Event from webapp.models import KaehmyForm, KaehmyMessage from webapp.models import CustomKaehmyRole, PresetKaehmyRole from modeltranslation.admin import TranslationAdmin - +from django.contrib.auth.models import Permission # this is needed so that the models get registered for translation import webapp.translation +admin.site.register(Permission) + admin.site.register(Feed, TranslationAdmin) admin.site.register(Tag, TranslationAdmin) admin.site.register(Event, TranslationAdmin) diff --git a/webapp/management/commands/initialize.py b/webapp/management/commands/initialize.py index 650a175..d7ab9da 100644 --- a/webapp/management/commands/initialize.py +++ b/webapp/management/commands/initialize.py @@ -9,12 +9,56 @@ class Command(BaseCommand): This command MUST do nothing if already run. ''' + def create_infoscreen_moderator(self): + self.stdout.write("Creating infoscreen moderator group") + infoscreen_group, created = Group.objects.get_or_create(name="infoscreen moderators") + if not created: + self.stdout.write('The group "infoscreen moderators" already existed ' + 'and was not therefore created') + + cts = ContentType.objects.filter(app_label='infoscreen') + permissions = Permission.objects.filter(content_type__in=cts) + infoscreen_group.permissions.add(*permissions) + + def create_member_register_viewer(self): + self.stdout.write("Creating member register viewer group") + viewers_group, created = Group.objects.get_or_create(name="member register viewers") + if not created: + self.stdout.write('The group "member register viewers" already existed ' + 'and was not therefore created') + + cts = ContentType.objects.filter(app_label='members') + members_permissions = Permission.objects.filter(content_type__in=cts, codename__contains='read') + + viewers_group.permissions.add(*members_permissions) + + def create_member_register_administrator(self): + self.stdout.write("Creating member register administrator group") + admins_group, created = Group.objects.get_or_create(name="member register administrators") + if not created: + self.stdout.write('The group "member register administrators" already existed ' + 'and was not therefore created') + + cts = ContentType.objects.filter(app_label='members') + permissions = Permission.objects.filter(content_type__in=cts) + admins_group.permissions.add(*permissions) + + def create_official(self): + self.stdout.write("Creating official group") + officials_group, created = Group.objects.get_or_create(name="officials") + if not created: + self.stdout.write('The group "officials" already existed ' + 'and was not therefore created') + + feed_permissions = Permission.objects.filter(codename__contains='feed') + officials_group.permissions.add(*feed_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' + self.stdout.write('The group "sikadmin" already existed ' 'and was not therefore created') self.stdout.write("Creating sikadmin permission") @@ -27,7 +71,7 @@ class Command(BaseCommand): name='SIK Admin') if not created: - self.stdout.write('The permission "sikadmin" already existed' + self.stdout.write('The permission "sikadmin" already existed ' 'and was not therefore created') self.stdout.write("Giving sikadmin group permission to sikadmin") @@ -36,4 +80,8 @@ class Command(BaseCommand): else: sikadmin_group.permissions.add(sikadmin_permission) + self.create_infoscreen_moderator() + self.create_member_register_viewer() + self.create_member_register_administrator() + self.create_official() self.stdout.write("Initialization successful")