From 82e7de0ebc0b5a1451373ba5b57598282350abfc Mon Sep 17 00:00:00 2001
From: gzbender <gzbender74@gmail.com>
Date: Tue, 8 Oct 2019 01:36:31 +0300
Subject: [PATCH] =?UTF-8?q?=D0=95=D1=81=D0=BB=D0=B8=20=D0=BF=D0=BE=D0=BB?=
 =?UTF-8?q?=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D1=8C=20=D0=B7?=
 =?UTF-8?q?=D0=B0=D0=BB=D0=BE=D0=B3=D0=B8=D0=BD=D0=B5=D0=BD=20=D0=BD=D0=B0?=
 =?UTF-8?q?=20=D0=BB=D0=B5=D0=BD=D0=B4=D0=B8=D0=BD=D0=B3=D0=B5,=20=D1=82?=
 =?UTF-8?q?=D0=BE=20=D0=BA=D0=B8=D0=B4=D0=B0=D1=82=D1=8C=20=D0=B5=D0=B3?=
 =?UTF-8?q?=D0=BE=20=D0=B4=D0=B0=D0=BB=D1=8C=D1=88=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/auth/views.py |  2 ++
 apps/user/admin.py | 27 ++++++++++++++++++++++++++-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/apps/auth/views.py b/apps/auth/views.py
index f670d883..43f66bc0 100644
--- a/apps/auth/views.py
+++ b/apps/auth/views.py
@@ -256,6 +256,8 @@ class LandingRegistrationView(View):
         email = form.cleaned_data['email'].lower()
 
         if User.objects.filter(email=email).count():
+            if request.user.is_authenticated and request.user.email == email:
+                return redirect('/')
             return redirect('/p/user-exists')
 
         user = User(
diff --git a/apps/user/admin.py b/apps/user/admin.py
index 50915f33..f47bb7ef 100644
--- a/apps/user/admin.py
+++ b/apps/user/admin.py
@@ -8,11 +8,36 @@ from .models import AuthorRequest, EmailSubscription, SubscriptionCategory, Emai
 User = get_user_model()
 
 
+class FromLandingFilter(admin.SimpleListFilter):
+    title = 'С лендинга'
+    parameter_name = 'from_landing'
+
+    def lookups(self, request, model_admin):
+        return (
+            ('yes', 'Да'),
+        )
+
+    def queryset(self, request, queryset):
+        if self.value() == 'yes':
+            return queryset.exclude(phone2__isnull=True)
+
+
 @admin.register(User)
 class UserAdmin(BaseUserAdmin):
+    list_display = (
+        'email',
+        'get_full_name',
+        'phone',
+        'phone2',
+        'role',
+        'is_staff',
+        'is_active',
+    )
+    list_filter = (FromLandingFilter, 'is_staff', 'is_superuser', 'is_active',)
     fieldsets = (
         (None, {'fields': ('username', 'password')}),
-        (_('Personal info'), {'fields': ('first_name', 'last_name', 'email', 'gender', 'about', 'photo',)}),
+        (_('Personal info'), {'fields': ('first_name', 'last_name', 'email', 'gender', 'about', 'photo',
+                                         'phone', 'phone2')}),
         ('Teacher', {'fields': ('show_in_mainpage', 'trial_lesson', 'instagram_hashtag',)}),
         ('Facebook Auth data', {'fields': ('fb_id', 'fb_data', 'is_email_proved')}),
         (_('Permissions'), {'fields': ('role', 'is_active', 'is_staff', 'is_superuser',