From 71c4ce41f0cabca2be10b67d62af5128f392c894 Mon Sep 17 00:00:00 2001 From: SDE Date: Fri, 20 Oct 2023 20:07:11 +0300 Subject: [PATCH] 0.7.61 user_subscribe in all views --- ArticlesApp/views.py | 10 +++++++--- AuthApp/views.py | 14 +++++++++----- GeneralApp/funcs.py | 14 ++++++++++++++ GeneralApp/views.py | 8 +++++--- ReferenceDataApp/js_views.py | 1 + RoutesApp/views.py | 5 +++-- SubscribesApp/funcs.py | 10 ++++++++++ 7 files changed, 49 insertions(+), 13 deletions(-) create mode 100644 GeneralApp/funcs.py diff --git a/ArticlesApp/views.py b/ArticlesApp/views.py index cb7cf5d..735532c 100644 --- a/ArticlesApp/views.py +++ b/ArticlesApp/views.py @@ -6,6 +6,7 @@ from datetime import datetime, date from django.http import Http404, HttpResponse from django.template import loader from .funcs import * +from GeneralApp.funcs import get_inter_http_respose # from django.contrib.auth.decorators import login_required # from BaseModels.search_optimization.ld_json.ld_article_news import get_ld_article_news @@ -80,7 +81,8 @@ def ArticlesPageView(request, year=None): Dict = get_articles(art_kwargs=kwargs) t = loader.get_template('pages/p_articles.html') - return HttpResponse(t.render(Dict, request)) + return get_inter_http_respose(t, Dict, request) + # return HttpResponse(t.render(Dict, request)) @@ -112,7 +114,8 @@ def UserPageView(request, page_url): t = loader.get_template('pages/p_user_page.html') - return HttpResponse(t.render(Dict, request)) + return get_inter_http_respose(t, Dict, request) + # return HttpResponse(t.render(Dict, request)) @@ -141,4 +144,5 @@ def ArticlesOnePageView(request, art_url): t = loader.get_template('pages/p_article.html') - return HttpResponse(t.render(Dict, request)) + return get_inter_http_respose(t, Dict, request) + # return HttpResponse(t.render(Dict, request)) diff --git a/AuthApp/views.py b/AuthApp/views.py index 6abc719..22ddeff 100644 --- a/AuthApp/views.py +++ b/AuthApp/views.py @@ -13,14 +13,15 @@ from django.utils.translation import gettext as _ from datetime import datetime from django.contrib.auth.decorators import login_required from .funcs import * - +from GeneralApp.funcs import get_inter_http_respose def registration_View(request): Dict = {} t = loader.get_template('pages/profile/p_registration.html') - return HttpResponse(t.render(Dict, request)) + return get_inter_http_respose(t, Dict, request) + # return HttpResponse(t.render(Dict, request)) # def create_route_for_customer_View(request): @@ -43,7 +44,8 @@ def profile_page_View(request, page_name, id=None): } t = loader.get_template('pages/profile/p_user_profile.html') - return HttpResponse(t.render(Dict, request)) + return get_inter_http_respose(t, Dict, request) + # return HttpResponse(t.render(Dict, request)) # @login_required(login_url='/profile/login/') @@ -84,7 +86,8 @@ def user_profile_View(request): # request.COOKIES['user_id'] = request.user.id t = loader.get_template('pages/profile/p_user_profile.html') - response = HttpResponse(t.render(Dict, request)) + response = get_inter_http_respose(t, Dict, request) + # response = HttpResponse(t.render(Dict, request)) response.set_cookie('user_id', request.user.id) return response @@ -101,7 +104,8 @@ def login_View(request): Dict = {} t = loader.get_template('pages/profile/p_login.html') - return HttpResponse(t.render(Dict, request)) + return get_inter_http_respose(t, Dict, request) + # return HttpResponse(t.render(Dict, request)) diff --git a/GeneralApp/funcs.py b/GeneralApp/funcs.py new file mode 100644 index 0000000..983fc4b --- /dev/null +++ b/GeneralApp/funcs.py @@ -0,0 +1,14 @@ +from django.http import HttpResponse, Http404, FileResponse + +def get_inter_Dict(user): + + from SubscribesApp.funcs import get_cur_user_subscribe + user_subscribe = get_cur_user_subscribe(user) + + return {'user_subscribe': user_subscribe} + +def get_inter_http_respose(template_obj, context_Dict, request): + + context_Dict.update(get_inter_Dict(request.user)) + + return HttpResponse(template_obj.render(context_Dict, request)) \ No newline at end of file diff --git a/GeneralApp/views.py b/GeneralApp/views.py index 5e73578..f19defc 100644 --- a/GeneralApp/views.py +++ b/GeneralApp/views.py @@ -5,7 +5,7 @@ from django.template import loader, RequestContext from django.contrib.auth.decorators import login_required from .models import * from django.conf import settings - +from .funcs import get_inter_http_respose def test_code(request): from RoutesApp.funcs import get_city_by_type_transport_and_address_point @@ -55,7 +55,8 @@ def MainPage(request): Dict.update({'breadcrumbs': breadcrumbs_Dict}) t = loader.get_template('pages/p_main.html') - return HttpResponse(t.render(Dict, request)) + return get_inter_http_respose(t, Dict, request) + # return HttpResponse(t.render(Dict, request)) @@ -99,6 +100,7 @@ def StaticPageView(request, url): }) t = loader.get_template('pages/p_static_page.html') - return HttpResponse(t.render(Dict, request)) + return get_inter_http_respose(t, Dict, request) + # return HttpResponse(t.render(Dict, request)) diff --git a/ReferenceDataApp/js_views.py b/ReferenceDataApp/js_views.py index e8aadc9..8cc66bf 100644 --- a/ReferenceDataApp/js_views.py +++ b/ReferenceDataApp/js_views.py @@ -13,6 +13,7 @@ from django.template.loader import render_to_string from django.urls import reverse from django.db.models import Q import json +from GeneralApp.funcs import get_inter_http_respose def get_address_point_ajax(request): from .funcs import search_cities_in_db, search_airports_in_db diff --git a/RoutesApp/views.py b/RoutesApp/views.py index e8aa618..98cdfe9 100644 --- a/RoutesApp/views.py +++ b/RoutesApp/views.py @@ -11,7 +11,7 @@ from django.utils.translation import gettext as _ from datetime import datetime from .funcs import * from .forms import * - +from GeneralApp.funcs import get_inter_http_respose @@ -40,4 +40,5 @@ def route_search_results_View(request): Dict.update({'route_form': RouteForm(initial=data)}) t = loader.get_template('pages/p_results_find_route.html') - return HttpResponse(t.render(Dict, request)) + return get_inter_http_respose(t, Dict, request) + # return HttpResponse(t.render(Dict, request)) diff --git a/SubscribesApp/funcs.py b/SubscribesApp/funcs.py index d6f6450..b0c2a85 100644 --- a/SubscribesApp/funcs.py +++ b/SubscribesApp/funcs.py @@ -1,6 +1,16 @@ from .models import * from django.template.loader import render_to_string +def get_cur_user_subscribe(user): + + user_subscribe = None + try: + user_subscribe = SubscribeForUser.objects.get(user) + except Exception as e: + pass + + return user_subscribe + def get_subsribes_w_options(): all_options = SubscribeOption.objects.filter(enable=True)