|
@@ -163,9 +163,9 @@ class Device_User(AbstractBaseUser):
|
|
|
verbose_name=u'用户ID', unique=True, default=CommonService.getUserID(getUser=True))
|
|
|
role = models.ManyToManyField(to='Role', blank=True, verbose_name=u'用户角色', db_table='user_role')
|
|
|
|
|
|
- username = models.CharField(max_length=40, verbose_name=u'用户名', unique=True, null=True, blank=True)
|
|
|
+ username = models.CharField(max_length=40, verbose_name=u'用户名', default='', blank=True)
|
|
|
password = models.CharField(max_length=128, verbose_name=u'密码')
|
|
|
- userEmail = models.EmailField(max_length=64, verbose_name=u'邮箱', unique=True, null=True, blank=True)
|
|
|
+ userEmail = models.EmailField(max_length=64, verbose_name=u'邮箱', default='', blank=True)
|
|
|
# 实际的路径就是 MEDIA_ROOT/Image/filename,所以可用upload_to来指定文件存放的前缀路径
|
|
|
userIconPath = ProcessedImageField(blank=True, upload_to='User/Images/', default='static/User/default.png',
|
|
|
verbose_name=u'头像',
|
|
@@ -182,9 +182,9 @@ class Device_User(AbstractBaseUser):
|
|
|
online = models.BooleanField(blank=True, default=False, verbose_name=u'用户登录状态')
|
|
|
machine_code = models.CharField(blank=True, max_length=128, default='', verbose_name=u'机械码')
|
|
|
|
|
|
- language = models.CharField(blank=True, null=True, max_length=16, default='', verbose_name=u'语言地区')
|
|
|
+ language = models.CharField(blank=True, max_length=16, default='en', verbose_name=u'语言地区')
|
|
|
# 手机注册增加字段
|
|
|
- phone = models.CharField(max_length=16, verbose_name=u'手机号', unique=True, null=True, blank=True)
|
|
|
+ phone = models.CharField(max_length=16, verbose_name=u'手机号', default='', blank=True)
|
|
|
|
|
|
objects = UserManager()
|
|
|
|