瀏覽代碼

fix(api): switch user dyn default from True to False, allow override

Peter Thomassen 8 年之前
父節點
當前提交
121364b445
共有 3 個文件被更改,包括 24 次插入2 次删除
  1. 20 0
      api/desecapi/migrations/0016_dyn_flag_default.py
  2. 3 2
      api/desecapi/models.py
  3. 1 0
      api/desecapi/serializers.py

+ 20 - 0
api/desecapi/migrations/0016_dyn_flag_default.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.3 on 2017-07-28 21:39
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('desecapi', '0015_rrset'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='user',
+            name='dyn',
+            field=models.BooleanField(default=False),
+        ),
+    ]

+ 3 - 2
api/desecapi/models.py

@@ -9,7 +9,7 @@ from django.core.validators import MinValueValidator
 
 
 class MyUserManager(BaseUserManager):
-    def create_user(self, email, password=None, registration_remote_ip=None, captcha_required=False):
+    def create_user(self, email, password=None, registration_remote_ip=None, captcha_required=False, dyn=False):
         """
         Creates and saves a User with the given email, date of
         birth and password.
@@ -21,6 +21,7 @@ class MyUserManager(BaseUserManager):
             email=self.normalize_email(email),
             registration_remote_ip=registration_remote_ip,
             captcha_required=captcha_required,
+            dyn=dyn,
         )
 
         user.set_password(password)
@@ -52,7 +53,7 @@ class User(AbstractBaseUser):
     captcha_required = 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)
-    dyn = models.BooleanField(default=True)
+    dyn = models.BooleanField(default=False)
 
     objects = MyUserManager()
 

+ 1 - 0
api/desecapi/serializers.py

@@ -73,4 +73,5 @@ class UserRegistrationSerializer(djoserSerializers.UserRegistrationSerializer):
         fields = tuple(User.REQUIRED_FIELDS) + (
             User.USERNAME_FIELD,
             'password',
+            'dyn',
         )