From 69c6c73368975cda4db0b47d90285b1cafc53a48 Mon Sep 17 00:00:00 2001 From: Andrey Date: Tue, 17 Oct 2017 12:28:31 +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/models.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/access/models.py b/access/models.py index 4596c0c..9d000f1 100755 --- a/access/models.py +++ b/access/models.py @@ -1,6 +1,7 @@ # encoding=utf-8 import random import string +import json from courses.models import Vertex, Course from storage.models import Storage @@ -60,10 +61,12 @@ class CustomUserManager(BaseUserManager): return self._create_user(**kwargs) @transaction_decorator - def _create_user(self, email, password=None, is_staff=False, is_superuser=False, role_list=[], + def _create_user(self, email, password=None, is_staff=False, is_superuser=False, role_list=None, is_active=False, first_name='Guest', hash_password=None, is_send=False, date_joined=timezone.now(), last_login=timezone.now(), **extra_fields): + if role_list is None: + role_list = [] if not email: raise ValueError('The given email must be set') @@ -81,10 +84,13 @@ class CustomUserManager(BaseUserManager): user.password = hash_password user.save(using=self._db) + Account.objects.create(owner=user) - for group in role_list: - user.groups.add(group) + if role_list: + for group in json.loads(role_list): + user.groups.add(group) + user.save(using=self._db) if is_send: pass