diff --git a/AuthApp/admin.py b/AuthApp/admin.py index 516022c..dde7243 100644 --- a/AuthApp/admin.py +++ b/AuthApp/admin.py @@ -43,6 +43,7 @@ class Admin_ProfileInline(admin.StackedInline): ('enable',), ('phone',), ('country', 'city'), + ('mailing_on', ), ('authMailCode',), ('birthdate'), 'comment', 'creator' @@ -71,6 +72,10 @@ class Admin_ProfileInline(admin.StackedInline): class Admin_User(UserAdmin): + def mailing_on(self, obj): + return obj.user_profile.mailing_on + mailing_on.boolean = True + fieldsets = ( (None, { 'classes': ['wide'], @@ -91,12 +96,14 @@ class Admin_User(UserAdmin): save_on_top = True - list_display = ['id', 'last_name', 'first_name', 'email', 'is_staff', + list_display = ['id', 'last_name', 'first_name', 'mailing_on', 'email', 'is_staff', 'is_active'] list_editable = ['is_staff', 'is_active'] list_display_links = ['first_name', 'last_name', 'email'] search_fields = ['first_name', 'last_name', 'email'] + list_filter = ['user_profile__mailing_on', 'is_staff', 'is_active'] + inlines = (Admin_ProfileInline,) # actions = ['del_all_temp_users', ] diff --git a/AuthApp/js_views.py b/AuthApp/js_views.py index 88fa544..eb3526c 100644 --- a/AuthApp/js_views.py +++ b/AuthApp/js_views.py @@ -58,13 +58,14 @@ def mailing_subscribe_ajax(request): user = None if user: - redirect_url = f"{reverse('login_profile')}?mailing_for_email={email}" + redirect_url = {reverse('login_profile')} else: - redirect_url = f"{reverse('registration_page')}?mailing_for_email={email}" + redirect_url = {reverse('registration_page')} return JsonResponse({ 'status': 'sended', - 'redirect_url': redirect_url + 'redirect_url': redirect_url, + 'email': email })