temporary update

rog/models.py

@@ -69,13 +69,13 @@ def remove_bom_inplace(path):
 
 class CustomUserManager(BaseUserManager):
     
-    def create_user(self, email, password, group, event_code, team_name, **other_fields):
+    def create_user(self, email, password=None, **other_fields):
         if not email:
             raise ValueError(_("You must provide an email address"))
-        
-        user = self.model(email=email, group=group, event_code=event_code, team_name=team_name, zekken_number=email, is_rogaining=True, **other_fields)
+        email = self.normalize_email(email)
+        user = self.model(email=email, **other_fields)
         user.set_password(password)
-        user.save()
+        user.save(using=self._db)
 
         return user
 
@@ -95,7 +95,7 @@ class CustomUserManager(BaseUserManager):
         if other_fields.get('is_superuser') is not True:
             raise ValueError(_('Superuser must have is_superuser set to True'))
 
-        return self.create_user(email, password, group, event_code, team_name, **other_fields)
+        return self.create_user(email, password, **other_fields)
 
 
 
@@ -261,7 +261,7 @@ class TempUser(models.Model):
     def is_valid(self):
         return timezone.now() <= self.expires_at
 
-class Event(models.Model):
+class NewEvent(models.Model):
     event_name = models.CharField(max_length=255, primary_key=True)
     start_datetime = models.DateTimeField(default=timezone.now)
     end_datetime = models.DateTimeField()
@@ -311,7 +311,7 @@ class Category(models.Model):
 
 class Entry(models.Model):
     team = models.ForeignKey(Team, on_delete=models.CASCADE)
-    event = models.ForeignKey(Event, on_delete=models.CASCADE)
+    event = models.ForeignKey(NewEvent, on_delete=models.CASCADE)
     category = models.ForeignKey(Category, on_delete=models.CASCADE)
     date = models.DateTimeField()
 
@@ -1002,7 +1002,10 @@ def updatePolygonTable(mdl, fields):
 
 def createUser(fields):
     with transaction.atomic():
-        user = CustomUser.objects.create_user(email=fields[0], event_code=fields[1], team_name=fields[2], group=fields[3], password=fields[4])
+        other_fields.setdefault('event_code',fields[1])
+        other_fields.setdefault('team_name',fields[1])
+        other_fields.setdefault('group',fields[1])
+        user = CustomUser.objects.create_user(email=fields[0], password=fields[4], **other_fields)
         user.is_superuser = False
         user.is_staff = False
         user.save()