diff --git a/apps/user/migrations/0003_auto_20180129_0624.py b/apps/user/migrations/0003_auto_20180129_0624.py new file mode 100644 index 00000000..86e4ad32 --- /dev/null +++ b/apps/user/migrations/0003_auto_20180129_0624.py @@ -0,0 +1,59 @@ +# Generated by Django 2.0.1 on 2018-01-29 06:24 + +import django.contrib.postgres.fields.jsonb +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('user', '0002_auto_20180129_0537'), + ] + + operations = [ + migrations.AlterField( + model_name='user', + name='about', + field=models.CharField(blank=True, default='', max_length=1000, verbose_name='О себе'), + ), + migrations.AlterField( + model_name='user', + name='facebook', + field=models.URLField(blank=True, default='', null=True), + ), + migrations.AlterField( + model_name='user', + name='fb_data', + field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, default={}, null=True), + ), + migrations.AlterField( + model_name='user', + name='gender', + field=models.CharField(choices=[('n', 'не указан'), ('m', 'Мужчина'), ('f', 'Женщина')], default='n', max_length=1, verbose_name='Пол'), + ), + migrations.AlterField( + model_name='user', + name='instagram', + field=models.URLField(blank=True, default='', null=True), + ), + migrations.AlterField( + model_name='user', + name='pinterest', + field=models.URLField(blank=True, default='', null=True), + ), + migrations.AlterField( + model_name='user', + name='twitter', + field=models.URLField(blank=True, default='', null=True), + ), + migrations.AlterField( + model_name='user', + name='vkontakte', + field=models.URLField(blank=True, default='', null=True, verbose_name='ВКонтакте'), + ), + migrations.AlterField( + model_name='user', + name='youtube', + field=models.URLField(blank=True, default='', null=True), + ), + ] diff --git a/apps/user/models.py b/apps/user/models.py index 17d1e83c..c21cc819 100644 --- a/apps/user/models.py +++ b/apps/user/models.py @@ -17,18 +17,18 @@ class User(AbstractUser): ) email = models.EmailField(_('email address'), unique=True) role = models.PositiveSmallIntegerField('Роль', default=0, choices=ROLE_CHOICES) - gender = models.CharField('Пол', max_length=1, choices=GENDER_CHOICES) + gender = models.CharField('Пол', max_length=1, default='n', choices=GENDER_CHOICES) country = models.CharField('Страна', max_length=50, default='') city = models.CharField('Город', max_length=85, default='') - about = models.CharField('О себе', max_length=1000, default='') - instagram = models.URLField(default='') - facebook = models.URLField(default='') - twitter = models.URLField(default='') - pinterest = models.URLField(default='') - youtube = models.URLField(default='') - vkontakte = models.URLField('ВКонтакте', default='') + about = models.CharField('О себе', max_length=1000, default='', blank=True) + instagram = models.URLField(default='', null=True, blank=True) + facebook = models.URLField(default='', null=True, blank=True) + twitter = models.URLField(default='', null=True, blank=True) + pinterest = models.URLField(default='', null=True, blank=True) + youtube = models.URLField(default='', null=True, blank=True) + vkontakte = models.URLField('ВКонтакте', default='', null=True, blank=True) fb_id = models.PositiveIntegerField(null=True, blank=True, unique=True) - fb_data = pgfields.JSONField(default={}) + fb_data = pgfields.JSONField(default={}, null=True, blank=True) is_email_proved = models.BooleanField('Верифицирован по email', default=False) photo = models.ImageField('Фото', null=True, blank=True, upload_to='users')