Merge remote-tracking branch 'origin/main'

AuthApp/js_urls.py

@@ -18,7 +18,7 @@ urlpatterns = [
     path('new_msg_to_user/', new_msg_to_user_ajax, name='new_msg_to_user' ),
 
     path('new_msg_to_support/', new_msg_to_support_ajax, name='new_msg_to_support_ajax'),
-    path('support_create_ticket_ajax/', support_create_ticket_ajax, name='support_create_ticket_ajax'),
+
 
     path('change_profile/', change_profile_ajax, name='change_profile_ajax'),
 ]

AuthApp/js_views.py

@@ -47,19 +47,7 @@ def new_msg_to_support_ajax(request):
     return JsonResponse({'html': html}, status=200)
 
 
-@login_required(login_url='/profile/login/')
-def support_create_ticket_ajax(request):
-    from ChatServiceApp.forms import CreateTicketForm
 
-    if request.method != 'POST':
-        raise Http404
-
-    Dict = {
-        'forms': CreateTicketForm()
-    }
-
-    html = render_to_string('blocks/profile/b_create_ticket.html', Dict, request=request)
-    return JsonResponse({'html': html}, status=200)
 
 
 @login_required(login_url='/profile/login/')

ChatServiceApp/js_urls.py

@@ -0,0 +1,13 @@
+# coding=utf-8
+from django.urls import path
+# from AuthApp.js_views import *
+# from AuthApp.import_funcs import *
+from .js_views import *
+from django.contrib.auth import views
+from RoutesApp.js_views import new_route_view_ajax
+
+urlpatterns = [
+    path('support_create_ticket_ajax/', support_create_ticket_ajax, name='support_create_ticket_ajax'),
+    # path('create_/', registration_ajax, name='registration_ajax'),
+
+]

ChatServiceApp/js_views.py

@@ -0,0 +1,27 @@
+from django.shortcuts import render
+
+from uuid import uuid1
+from .models import *
+from django.contrib import auth
+from django.http import HttpResponse, Http404, JsonResponse
+from django.template import loader, RequestContext
+from django.contrib.auth.decorators import login_required
+from BaseModels.mailSender import techSendMail
+from django.utils.translation import gettext as _
+from datetime import datetime
+from django.template.loader import render_to_string
+from django.urls import reverse
+
+@login_required(login_url='/profile/login/')
+def support_create_ticket_ajax(request):
+    from ChatServiceApp.forms import CreateTicketForm
+
+    if request.method != 'POST':
+        raise Http404
+
+    Dict = {
+        'forms': CreateTicketForm()
+    }
+
+    html = render_to_string('blocks/profile/b_create_ticket.html', Dict, request=request)
+    return JsonResponse({'html': html}, status=200)

RoutesApp/js_views.py

@@ -21,7 +21,7 @@ def edit_route_ajax(request):
     if request.method != 'POST':
         raise Http404
 
-    data = request.POST
+    data = json.loads(request.body)
 
     Dict = {}
 
@@ -29,7 +29,7 @@ def edit_route_ajax(request):
 
         if not 'route_id' in data:
             msg = f'Недостаточно данных'
-            return {'errors': msg}
+            return JsonResponse({'errors': msg})
 
         route = Route.objects.get(data['route_id'])
 

TWB/urls.py

@@ -21,6 +21,7 @@ urlpatterns += i18n_patterns(
 
     path('user_account/', include('AuthApp.js_urls')),
     path('routes/', include('RoutesApp.js_urls')),
+    path('messages/', include('ChatServiceApp.js_urls')),
 
     path('reference_data/', include('ReferenceDataApp.js_urls')),
 

static/js/user_profile.js

@@ -373,6 +373,10 @@ function getRoute(){
         }
     });
 }function editRoute(id) {
+    let route_obj = {
+        'route_id': id
+    }
+
      $.ajax({
         headers: { "X-CSRFToken": $('input[name=csrfmiddlewaretoken]').val() },
         url: '/ru/routes/edit_route/',
@@ -382,7 +386,7 @@ function getRoute(){
         processData: false,
         contentType: false,
         // enctype: 'json',
-        data: id,
+        data: JSON.stringify(route_obj),
         success: function(data){
             console.log('data received')
             // location.href = '/profile'

templates/widgets/w_route_info.html

@@ -1,4 +1,5 @@
     {% for route in routes %}
+
         <div class="my_route">
             <div class="route_info">
                 <div class="route_info_about">