From 1d7a40c2a3b1f8f58f52fd355dba5842fb3ce9fe Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Sun, 29 Apr 2018 13:09:05 +0300 Subject: [PATCH] Change user manager --- .../migrations/0016_auto_20180429_1308.py | 36 +++++++++++++++++++ .../migrations/0021_auto_20180429_1308.py | 20 +++++++++++ apps/user/models.py | 2 ++ 3 files changed, 58 insertions(+) create mode 100644 apps/payment/migrations/0016_auto_20180429_1308.py create mode 100644 apps/user/migrations/0021_auto_20180429_1308.py diff --git a/apps/payment/migrations/0016_auto_20180429_1308.py b/apps/payment/migrations/0016_auto_20180429_1308.py new file mode 100644 index 00000000..c613f75a --- /dev/null +++ b/apps/payment/migrations/0016_auto_20180429_1308.py @@ -0,0 +1,36 @@ +# Generated by Django 2.0.4 on 2018-04-29 10:08 + +from django.db import migrations +import django.db.models.manager + + +class Migration(migrations.Migration): + + dependencies = [ + ('payment', '0015_auto_20180307_0911'), + ] + + operations = [ + migrations.AlterModelOptions( + name='payment', + options={'base_manager_name': 'non_polymorphic', 'ordering': ('created_at',), 'verbose_name': 'Платеж', 'verbose_name_plural': 'Платежи'}, + ), + migrations.AlterModelManagers( + name='coursepayment', + managers=[ + ('non_polymorphic', django.db.models.manager.Manager()), + ], + ), + migrations.AlterModelManagers( + name='payment', + managers=[ + ('non_polymorphic', django.db.models.manager.Manager()), + ], + ), + migrations.AlterModelManagers( + name='schoolpayment', + managers=[ + ('non_polymorphic', django.db.models.manager.Manager()), + ], + ), + ] diff --git a/apps/user/migrations/0021_auto_20180429_1308.py b/apps/user/migrations/0021_auto_20180429_1308.py new file mode 100644 index 00000000..6839bd8d --- /dev/null +++ b/apps/user/migrations/0021_auto_20180429_1308.py @@ -0,0 +1,20 @@ +# Generated by Django 2.0.4 on 2018-04-29 10:08 + +import apps.user.models +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('user', '0020_auto_20180409_1144'), + ] + + operations = [ + migrations.AlterModelManagers( + name='user', + managers=[ + ('objects', apps.user.models.UserManager()), + ], + ), + ] diff --git a/apps/user/models.py b/apps/user/models.py index 9ad272c1..70d19f7c 100644 --- a/apps/user/models.py +++ b/apps/user/models.py @@ -76,6 +76,8 @@ class User(AbstractUser): photo = models.ImageField('Фото', null=True, blank=True, upload_to='users') show_in_mainpage = models.BooleanField('Показывать на главной странице', default=False) + objects = UserManager() + USERNAME_FIELD = 'email' REQUIRED_FIELDS = ['username']