0.7.61

user_subscribe in all views

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))

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))
 
 
 

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))

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))
 
 

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

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))

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)