Pārlūkot izejas kodu

fix(api): make User migration independent of settings value

Peter Thomassen 4 gadi atpakaļ
vecāks
revīzija
335d921033

+ 1 - 1
api/desecapi/migrations/0001_initial_squashed_again.py

@@ -27,7 +27,7 @@ class Migration(migrations.Migration):
                 ('is_active', models.BooleanField(default=True)),
                 ('is_admin', models.BooleanField(default=False)),
                 ('created', models.DateTimeField(auto_now_add=True)),
-                ('limit_domains', models.IntegerField(blank=True, default=5, null=True)),
+                ('limit_domains', models.IntegerField(blank=True, default=desecapi.models.User._limit_domains_default, null=True)),
             ],
             options={
                 'abstract': False,

+ 5 - 1
api/desecapi/models.py

@@ -84,6 +84,10 @@ class MyUserManager(BaseUserManager):
 
 
 class User(ExportModelOperationsMixin('User'), AbstractBaseUser):
+    @staticmethod
+    def _limit_domains_default():
+        return settings.LIMIT_USER_DOMAIN_COUNT_DEFAULT
+
     id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
     email = CIEmailField(
         verbose_name='email address',
@@ -92,7 +96,7 @@ class User(ExportModelOperationsMixin('User'), AbstractBaseUser):
     is_active = models.BooleanField(default=True)
     is_admin = models.BooleanField(default=False)
     created = models.DateTimeField(auto_now_add=True)
-    limit_domains = models.IntegerField(default=settings.LIMIT_USER_DOMAIN_COUNT_DEFAULT, null=True, blank=True)
+    limit_domains = models.IntegerField(default=_limit_domains_default.__func__, null=True, blank=True)
 
     objects = MyUserManager()