sysadminix/account_store
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

0.12.30 fix login_required

Browse Source
This commit is contained in:
SDE
2024-04-04 22:45:20 +03:00
parent 536a1e967e
commit 46fdda269f
5 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
AuthApp/js_views.py
View File

@@ -20,7 +20,7 @@ from django.core.validators import validate_email
from django.urls import reverse from django.urls import reverse
from GeneralApp.funcs import get_and_set_lang from GeneralApp.funcs import get_and_set_lang
# @login_required(login_url='/profile/login/') # @login_required()#login_url='/profile/login/')
# def subscribe_ajax(request): # def subscribe_ajax(request):
# if request.method != 'POST': # if request.method != 'POST':
# raise Http404 # raise Http404
@@ -211,7 +211,7 @@ def send_message_ajax(request):
}, status=400) }, status=400)
@login_required(login_url='/profile/login/') @login_required()#login_url='/profile/login/')
def chats_ajax(request): def chats_ajax(request):
if request.method != 'POST': if request.method != 'POST':
raise Http404 raise Http404
@@ -243,7 +243,7 @@ def chats_ajax(request):
html = render_to_string('blocks/profile/b_chats.html', Dict, request=request) html = render_to_string('blocks/profile/b_chats.html', Dict, request=request)
return JsonResponse({'html': html}, status=200) return JsonResponse({'html': html}, status=200)
@login_required(login_url='/profile/login/') @login_required()#login_url='/profile/login/')
def support_tickets_ajax(request): def support_tickets_ajax(request):
if request.method != 'POST': if request.method != 'POST':
raise Http404 raise Http404
@@ -255,7 +255,7 @@ def support_tickets_ajax(request):
return JsonResponse({'html': html}, status=200) return JsonResponse({'html': html}, status=200)
@login_required(login_url='/profile/login/') @login_required()#login_url='/profile/login/')
def change_avatar_confirm_ajax(request): def change_avatar_confirm_ajax(request):
from django.core.files.base import ContentFile from django.core.files.base import ContentFile
from django.core.exceptions import RequestDataTooBig from django.core.exceptions import RequestDataTooBig
@@ -286,7 +286,7 @@ def change_avatar_confirm_ajax(request):
return JsonResponse({'url': request.user.user_profile.avatar.url}) return JsonResponse({'url': request.user.user_profile.avatar.url})
@login_required(login_url='/profile/login/') @login_required()#login_url='/profile/login/')
def change_profile_confirm_ajax(request): def change_profile_confirm_ajax(request):
if request.method != 'POST': if request.method != 'POST':
raise Http404 raise Http404
@@ -361,7 +361,7 @@ def change_profile_confirm_ajax(request):
return JsonResponse({'html': html}, status=200) return JsonResponse({'html': html}, status=200)
@login_required(login_url='/profile/login/') @login_required()#login_url='/profile/login/')
def dashboard_ajax(request): def dashboard_ajax(request):
if request.method != 'POST': if request.method != 'POST':
raise Http404 raise Http404
@@ -381,7 +381,7 @@ def dashboard_ajax(request):
return JsonResponse({'html': html}, status=200) return JsonResponse({'html': html}, status=200)
@login_required(login_url='/profile/login/') @login_required()#login_url='/profile/login/')
def change_profile_ajax(request): def change_profile_ajax(request):
if request.method != 'POST': if request.method != 'POST':
raise Http404 raise Http404
@@ -392,7 +392,7 @@ def change_profile_ajax(request):
return JsonResponse({'html': html}, status=200) return JsonResponse({'html': html}, status=200)
@login_required(login_url='/profile/login/') @login_required()#login_url='/profile/login/')
def my_routes_ajax(request): def my_routes_ajax(request):
if request.method != 'POST': if request.method != 'POST':
raise Http404 raise Http404

7
AuthApp/views.py
View File

@@ -14,6 +14,7 @@ from datetime import datetime
from django.contrib.auth.decorators import login_required from django.contrib.auth.decorators import login_required
from .funcs import * from .funcs import *
from GeneralApp.funcs import get_inter_http_respose from GeneralApp.funcs import get_inter_http_respose
from django.urls import reverse
def registration_View(request): def registration_View(request):
@@ -41,7 +42,7 @@ def registration_View(request):
# return HttpResponse(t.render(Dict, request)) # return HttpResponse(t.render(Dict, request))
@login_required(login_url='/profile/login/') @login_required()#login_url='/profile/login/')
def profile_page_View(request, page_name, id=None): def profile_page_View(request, page_name, id=None):
Dict = { Dict = {
'page_html': get_profile_page_content_html(request, page_name, id), 'page_html': get_profile_page_content_html(request, page_name, id),
@@ -74,7 +75,7 @@ def profile_page_View(request, page_name, id=None):
# return HttpResponse(t.render(Dict, request)) # return HttpResponse(t.render(Dict, request))
# @login_required(login_url='/profile/login/') # @login_required()#login_url='/profile/login/')
# def chat_w_user_View(request, user_id=None): # def chat_w_user_View(request, user_id=None):
# from ChatServiceApp.funcs import get_chat_page_content_Dict # from ChatServiceApp.funcs import get_chat_page_content_Dict
# #
@@ -103,7 +104,7 @@ def profile_page_View(request, page_name, id=None):
# t = loader.get_template('pages/profile/p_user_profile.html') # t = loader.get_template('pages/profile/p_user_profile.html')
# return HttpResponse(t.render(Dict, request)) # return HttpResponse(t.render(Dict, request))
@login_required(login_url='/profile/login/') @login_required()#login_url='/profile/login/')
def user_profile_View(request): def user_profile_View(request):
Dict = {} Dict = {}

12
ChatServiceApp/js_views.py
View File

@@ -18,7 +18,7 @@ from channels.layers import get_channel_layer
from asgiref.sync import async_to_sync from asgiref.sync import async_to_sync
@login_required(login_url='/profile/login/') @login_required()#login_url='/profile/login/')
def get_file_from_msg_ajax(request): def get_file_from_msg_ajax(request):
if request.method != 'POST': if request.method != 'POST':
@@ -46,7 +46,7 @@ def get_file_from_msg_ajax(request):
@login_required(login_url='/profile/login/') @login_required()#login_url='/profile/login/')
def show_chat_w_user_ajax(request): def show_chat_w_user_ajax(request):
if request.method != 'POST': if request.method != 'POST':
@@ -275,7 +275,7 @@ def update_chat_ajax(request):
return JsonResponse({'error': msg}, status=400) return JsonResponse({'error': msg}, status=400)
# @login_required(login_url='/profile/login/') # @login_required()#login_url='/profile/login/')
# def send_msg_ajax(request): # def send_msg_ajax(request):
# from AuthApp.models import User # from AuthApp.models import User
# #
@@ -387,7 +387,7 @@ def update_chat_ajax(request):
@login_required(login_url='/profile/login/') @login_required()#login_url='/profile/login/')
def support_show_chat_by_ticket_ajax(request): def support_show_chat_by_ticket_ajax(request):
if request.method != 'POST': if request.method != 'POST':
@@ -442,7 +442,7 @@ def support_show_chat_by_ticket_ajax(request):
return JsonResponse({'error': msg}, status=400) return JsonResponse({'error': msg}, status=400)
@login_required(login_url='/profile/login/') @login_required()#login_url='/profile/login/')
def support_create_ticket_form_ajax(request): def support_create_ticket_form_ajax(request):
from ChatServiceApp.forms import TicketForm from ChatServiceApp.forms import TicketForm
@@ -464,7 +464,7 @@ def support_create_ticket_form_ajax(request):
return JsonResponse({'html': html}, status=200) return JsonResponse({'html': html}, status=200)
@login_required(login_url='/profile/login/') @login_required()#login_url='/profile/login/')
def create_ticket_ajax(request): def create_ticket_ajax(request):
from ChatServiceApp.forms import TicketForm from ChatServiceApp.forms import TicketForm

4
SubscribesApp/js_views.py
View File

@@ -19,7 +19,7 @@ from asgiref.sync import async_to_sync
from GeneralApp.funcs import get_and_set_lang from GeneralApp.funcs import get_and_set_lang
@login_required(login_url='/profile/login/') @login_required()#login_url='/profile/login/')
def subscribe_now_ajax(request): def subscribe_now_ajax(request):
if request.method != 'POST': if request.method != 'POST':
@@ -73,7 +73,7 @@ def subscribe_now_ajax(request):
return JsonResponse({'error': msg}, status=400) return JsonResponse({'error': msg}, status=400)
@login_required(login_url='/profile/login/') @login_required()#login_url='/profile/login/')
def show_cur_subscribe_ajax(request): def show_cur_subscribe_ajax(request):
if request.method != 'POST': if request.method != 'POST':

5
TWB/settings.py
View File

@@ -45,7 +45,9 @@ ACCOUNT_USERNAME_REQUIRED = False
ACCOUNT_AUTHENTICATION_METHOD = 'email' ACCOUNT_AUTHENTICATION_METHOD = 'email'
ACCOUNT_EMAIL_VERIFICATION = 'optional' ACCOUNT_EMAIL_VERIFICATION = 'optional'
LOGIN_REDIRECT_URL = '/profile/page/dashboard/' LOGIN_REDIRECT_URL = '/profile/page/dashboard/'
LOGIN_URL = '/profile/login/' # LOGIN_URL = '/profile/login/'
from django.urls import reverse_lazy
LOGIN_URL = reverse_lazy('login_profile')
LOGOUT_REDIRECT_URL = '/profile/login/' LOGOUT_REDIRECT_URL = '/profile/login/'
@@ -249,6 +251,7 @@ LOCALE_PATHS = (
gettext = lambda s: s gettext = lambda s: s
LANGUAGES = ( LANGUAGES = (
(u'ru', gettext(u'Russian')), (u'ru', gettext(u'Russian')),