diff --git a/AuthApp/views.py b/AuthApp/views.py index 9650529..06a7c21 100644 --- a/AuthApp/views.py +++ b/AuthApp/views.py @@ -54,10 +54,10 @@ def profile_page_View(request, page_name, id=None): } }) - if request.GET and 'mobile' in request.GET and request.GET['mobile'] == 'true': - Dict.update({ - 'mobile': True - }) + # if request.GET and 'mobile' in request.GET and request.GET['mobile'] == 'true': + # Dict.update({ + # 'mobile': True + # }) t = loader.get_template('pages/profile/p_user_profile.html') return get_inter_http_respose(t, Dict, request) diff --git a/ChatServiceApp/js_views.py b/ChatServiceApp/js_views.py index 2ecfc83..1a13962 100644 --- a/ChatServiceApp/js_views.py +++ b/ChatServiceApp/js_views.py @@ -404,7 +404,7 @@ def support_show_chat_by_ticket_ajax(request): 'cur_receiver': cur_receiver, 'new_msg_allow': new_msg_allow, 'staff': request.user.is_staff, - 'mobile': data['mobile'] + # 'mobile': data['mobile'] } Dict.update(get_ticketsDict_for_staff(request.user)) diff --git a/TWB/settings.py b/TWB/settings.py index 76c5b35..581b3c4 100644 --- a/TWB/settings.py +++ b/TWB/settings.py @@ -45,7 +45,10 @@ ACCOUNT_USERNAME_REQUIRED = False ACCOUNT_AUTHENTICATION_METHOD = 'email' ACCOUNT_EMAIL_VERIFICATION = 'optional' LOGIN_REDIRECT_URL = '/profile/page/dashboard/' +LOGIN_URL = '/profile/login/' + LOGOUT_REDIRECT_URL = '/profile/login/' + ACCOUNT_SIGNUP_REDIRECT_URL = '/profile/page/dashboard/' ACCOUNT_LOGOUT_ON_GET = True # SOCIALACCOUNT_ADAPTER = 'GeneralApp.allauth_funcs.MyAccountAdapter'