1.3.6 add unanswered_msgs_count to all responses

This commit is contained in:
SDE
2024-06-29 14:44:19 +03:00
parent 75258f1706
commit 0e184f0b87
12 changed files with 147 additions and 45 deletions

View File

@@ -30,6 +30,17 @@ def get_and_set_lang(request):
return lang
def get_add_to_ajax_response_Dict(user):
context_Dict = {}
from ChatServiceApp.funcs import get_unanswered_msgs_count_for_user
context_Dict.update({
'unanswered_msgs_count': get_unanswered_msgs_count_for_user(user)
})
return context_Dict
def get_inter_Dict(user):
@@ -51,7 +62,7 @@ def get_inter_Dict(user):
return Dict
def get_inter_http_respose(template_obj, context_Dict, request):
def get_inter_http_response(template_obj, context_Dict, request):
context_Dict.update(get_inter_Dict(request.user))
@@ -72,4 +83,9 @@ def get_inter_http_respose(template_obj, context_Dict, request):
# if text and title and not request.user.is_anonymous:
# send_push(user=request.user, title=title, text=text)
from ChatServiceApp.funcs import get_unanswered_msgs_count_for_user
context_Dict.update({
'unanswered_msgs_count': get_unanswered_msgs_count_for_user(request.user)
})
return HttpResponse(template_obj.render(context_Dict, request))

View File

@@ -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
from .funcs import get_inter_http_response
from django.http.response import JsonResponse, HttpResponse
from django.views.decorators.http import require_GET, require_POST
from django.shortcuts import get_object_or_404
@@ -41,7 +41,7 @@ def Page404(request, exeption=None):
t = loader.get_template('404.html')
try:
res = get_inter_http_respose(t, Dict, request)
res = get_inter_http_response(t, Dict, request)
return HttpResponse(res, status=404)
except Exception as e:
return HttpResponse(str(e))
@@ -78,7 +78,7 @@ def MainPage(request):
Dict.update({'breadcrumbs': breadcrumbs_Dict})
t = loader.get_template('pages/p_main.html')
return get_inter_http_respose(t, Dict, request)
return get_inter_http_response(t, Dict, request)
# return HttpResponse(t.render(Dict, request))
@@ -126,7 +126,7 @@ def StaticPageView(request, url):
# send_push(user=request.user, title='title', text='text')
t = loader.get_template('pages/p_static_page.html')
return get_inter_http_respose(t, Dict, request)
return get_inter_http_response(t, Dict, request)
# return HttpResponse(t.render(Dict, request))