User.lang must be empty

remotes/origin/enhancement/email-actions
David Barragán Merino 2015-04-14 11:40:55 +02:00 committed by Alejandro Alonso
parent 9ef2f709c7
commit da0712be81
2 changed files with 28 additions and 2 deletions

View File

@ -0,0 +1,26 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
class Migration(migrations.Migration):
dependencies = [
('users', '0009_auto_20150326_1241'),
]
operations = [
migrations.AlterField(
model_name='user',
name='lang',
field=models.CharField(max_length=20, blank=True, null=True, default='', verbose_name='default language'),
preserve_default=True,
),
migrations.AlterField(
model_name='user',
name='timezone',
field=models.CharField(max_length=20, blank=True, null=True, default='', verbose_name='default timezone'),
preserve_default=True,
),
]

View File

@ -116,9 +116,9 @@ class User(AbstractBaseUser, PermissionsMixin):
max_length=500, null=True, blank=True,
verbose_name=_("photo"))
date_joined = models.DateTimeField(_('date joined'), default=timezone.now)
lang = models.CharField(max_length=20, null=False, blank=True, default="",
lang = models.CharField(max_length=20, null=True, blank=True, default="",
verbose_name=_("default language"))
timezone = models.CharField(max_length=20, null=False, blank=True, default="",
timezone = models.CharField(max_length=20, null=True, blank=True, default="",
verbose_name=_("default timezone"))
colorize_tags = models.BooleanField(null=False, blank=True, default=False,
verbose_name=_("colorize tags"))