0.12.25 timezone in chat messages
This commit is contained in:
@@ -124,6 +124,7 @@ def update_chat_ajax2(request):
|
|||||||
|
|
||||||
# формируем правую панель
|
# формируем правую панель
|
||||||
context_Dict.update({'receivers': receivers})
|
context_Dict.update({'receivers': receivers})
|
||||||
|
|
||||||
users_list_html = render_to_string(
|
users_list_html = render_to_string(
|
||||||
'blocks/profile/b_list_of_users_messenger.html', context_Dict, request=request)
|
'blocks/profile/b_list_of_users_messenger.html', context_Dict, request=request)
|
||||||
res_Dict.update({
|
res_Dict.update({
|
||||||
@@ -203,6 +204,8 @@ def update_chat_ajax(request):
|
|||||||
context_Dict.update({'messages': msgs})
|
context_Dict.update({'messages': msgs})
|
||||||
context_Dict = get_ticketsDict_for_staff(request.user)
|
context_Dict = get_ticketsDict_for_staff(request.user)
|
||||||
|
|
||||||
|
context_Dict.update(get_user_timezone_Dict(request.user))
|
||||||
|
|
||||||
tickets_list_html = render_to_string(
|
tickets_list_html = render_to_string(
|
||||||
'blocks/profile/b_list_of_tickets_support_chat.html', context_Dict, request=request)
|
'blocks/profile/b_list_of_tickets_support_chat.html', context_Dict, request=request)
|
||||||
res_Dict.update({
|
res_Dict.update({
|
||||||
@@ -222,6 +225,8 @@ def update_chat_ajax(request):
|
|||||||
required_beep = True
|
required_beep = True
|
||||||
|
|
||||||
context_Dict.update({'receivers': receivers})
|
context_Dict.update({'receivers': receivers})
|
||||||
|
context_Dict.update(get_user_timezone_Dict(request.user))
|
||||||
|
|
||||||
users_list_html = render_to_string(
|
users_list_html = render_to_string(
|
||||||
'blocks/profile/b_list_of_users_messenger.html', context_Dict, request=request)
|
'blocks/profile/b_list_of_users_messenger.html', context_Dict, request=request)
|
||||||
res_Dict.update({
|
res_Dict.update({
|
||||||
@@ -410,6 +415,8 @@ def support_show_chat_by_ticket_ajax(request):
|
|||||||
}
|
}
|
||||||
Dict.update(get_ticketsDict_for_staff(request.user))
|
Dict.update(get_ticketsDict_for_staff(request.user))
|
||||||
|
|
||||||
|
Dict.update(get_user_timezone_Dict(request.user))
|
||||||
|
|
||||||
tpl_name = 'blocks/profile/b_support_chat.html'
|
tpl_name = 'blocks/profile/b_support_chat.html'
|
||||||
Dict.update(get_user_timezone_Dict(request.user, request=request))
|
Dict.update(get_user_timezone_Dict(request.user, request=request))
|
||||||
html = render_to_string(tpl_name, Dict, request=request)
|
html = render_to_string(tpl_name, Dict, request=request)
|
||||||
@@ -431,6 +438,9 @@ def support_create_ticket_form_ajax(request):
|
|||||||
Dict = {
|
Dict = {
|
||||||
'form': TicketForm()
|
'form': TicketForm()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Dict.update(get_user_timezone_Dict(request.user))
|
||||||
|
|
||||||
tpl_name = 'blocks/profile/b_create_ticket.html'
|
tpl_name = 'blocks/profile/b_create_ticket.html'
|
||||||
|
|
||||||
html = render_to_string(tpl_name, Dict, request=request)
|
html = render_to_string(tpl_name, Dict, request=request)
|
||||||
@@ -452,6 +462,8 @@ def create_ticket_ajax(request):
|
|||||||
if not form.is_valid():
|
if not form.is_valid():
|
||||||
form.initial = form.cleaned_data
|
form.initial = form.cleaned_data
|
||||||
Dict = {'form': form}
|
Dict = {'form': form}
|
||||||
|
Dict.update(get_user_timezone_Dict(request.user))
|
||||||
|
|
||||||
html = render_to_string('blocks/profile/b_create_ticket.html', Dict, request=request)
|
html = render_to_string('blocks/profile/b_create_ticket.html', Dict, request=request)
|
||||||
return JsonResponse({'html': html}, status=400)
|
return JsonResponse({'html': html}, status=400)
|
||||||
|
|
||||||
@@ -492,6 +504,8 @@ def create_ticket_ajax(request):
|
|||||||
'messages': msgs_for_ticket
|
'messages': msgs_for_ticket
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Dict.update(get_user_timezone_Dict(request.user))
|
||||||
|
|
||||||
html = render_to_string('blocks/profile/b_support_chat.html', Dict, request=request)
|
html = render_to_string('blocks/profile/b_support_chat.html', Dict, request=request)
|
||||||
|
|
||||||
res_Dict = {
|
res_Dict = {
|
||||||
|
|||||||
Reference in New Issue
Block a user