From e527deaae1690d6f93caff92a27bf4c4fc88cbc0 Mon Sep 17 00:00:00 2001 From: Andrey Date: Tue, 17 Oct 2017 11:42:19 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BC=D0=B8=D0=B3=D1=80=D0=B0=D1=86=D0=B8?= =?UTF-8?q?=D0=B8=20=D1=8E=D0=B7=D0=B5=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- access/init_group.py | 6 +++--- access/models.py | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/access/init_group.py b/access/init_group.py index 7063c00..f51b30c 100644 --- a/access/init_group.py +++ b/access/init_group.py @@ -12,6 +12,6 @@ if __name__ == '__main__': Group.objects.get_or_create(name='teachers') Group.objects.get_or_create(name='managers') Group.objects.get_or_create(name='lead_managers') - Group.objects.get_or_create(name='curator') - Group.objects.get_or_create(name='partner') - Group.objects.get_or_create(name='project_manager') \ No newline at end of file + Group.objects.get_or_create(name='curators') + Group.objects.get_or_create(name='partners') + Group.objects.get_or_create(name='project_managers') \ No newline at end of file diff --git a/access/models.py b/access/models.py index 7ce1bc9..4596c0c 100755 --- a/access/models.py +++ b/access/models.py @@ -60,7 +60,7 @@ class CustomUserManager(BaseUserManager): return self._create_user(**kwargs) @transaction_decorator - def _create_user(self, email, password=None, is_staff=False, is_superuser=False, + def _create_user(self, email, password=None, is_staff=False, is_superuser=False, role_list=[], is_active=False, first_name='Guest', hash_password=None, is_send=False, date_joined=timezone.now(), last_login=timezone.now(), **extra_fields): @@ -83,6 +83,9 @@ class CustomUserManager(BaseUserManager): user.save(using=self._db) Account.objects.create(owner=user) + for group in role_list: + user.groups.add(group) + if is_send: pass Invite.objects.create(owner=user)