rfe

access/load_users.py

@@ -1,4 +1,4 @@
-import os, sys, django, csv
+import os, sys, django, csv, json
 
 sys.path.append("../")
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "lms.settings")
@@ -11,6 +11,12 @@ if __name__ == '__main__':
         user_reader = csv.DictReader(user_csv)
         for row in user_reader:
             try:
-                get_user_model().objects.get_or_create(**dict(row))
+                row = dict(row)
-            except ValueError:
+                print(row['role_list'])
-                pass
+                row['role_list'] = json.loads(row['role_list'])
+                get_user_model().objects.get_or_create(**row)
+            except ValueError as e:
+                if e == 'The given email must be set':
+                    print(e)
+                else:
+                    raise e

access/models.py

@@ -67,6 +67,7 @@ class CustomUserManager(BaseUserManager):
 
         if role_list is None:
             role_list = []
+
         if not email:
             raise ValueError('The given email must be set')
 
@@ -88,9 +89,8 @@ class CustomUserManager(BaseUserManager):
         Account.objects.create(owner=user)
 
         if role_list:
-            for group in json.loads(role_list):
+            for group in role_list:
                 user.groups.add(group)
-            user.save(using=self._db)
 
         if is_send:
             pass