Если пользователь залогинен на лендинге, то кидать его дальше

remotes/origin/feature/logined-landing-registration
gzbender 6 years ago
parent 6b1bc7b0ef
commit 82e7de0ebc
  1. 2
      apps/auth/views.py
  2. 27
      apps/user/admin.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(

@ -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',

Loading…
Cancel
Save