From da0712be814dac131c5105b542858caeae5277a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Tue, 14 Apr 2015 11:40:55 +0200 Subject: [PATCH] User.lang must be empty --- .../migrations/0010_auto_20150414_0936.py | 26 +++++++++++++++++++ taiga/users/models.py | 4 +-- 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 taiga/users/migrations/0010_auto_20150414_0936.py diff --git a/taiga/users/migrations/0010_auto_20150414_0936.py b/taiga/users/migrations/0010_auto_20150414_0936.py new file mode 100644 index 00000000..96eb7581 --- /dev/null +++ b/taiga/users/migrations/0010_auto_20150414_0936.py @@ -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, + ), + ] diff --git a/taiga/users/models.py b/taiga/users/models.py index 3c4af001..dc4eb862 100644 --- a/taiga/users/models.py +++ b/taiga/users/models.py @@ -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"))