feat(dev): user's requests (#291)

Fiery-brain · Jul 9, 2023 · c8234cb · c8234cb
1 parent 068aae3
commit c8234cb
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/acesta/front/templatetags/requests.py b/acesta/front/templatetags/requests.py
@@ -7,12 +7,12 @@
 
 
 @register.inclusion_tag("include/request_modal.html")
-def request_modal(request, subject):
+def request_modal(request, user, subject):
     return dict(
         REQUEST_CONSULTATION=settings.REQUEST_CONSULTATION,
         REQUEST_CHANNELS=dict(settings.REQUEST_CHANNELS_OUTSIDE),
-        consultation_form=get_request_form(request.user, settings.REQUEST_CONSULTATION),
-        presentation_form=get_request_form(request.user, settings.REQUEST_PRESENTATION),
+        consultation_form=get_request_form(user, settings.REQUEST_CONSULTATION),
+        presentation_form=get_request_form(user, settings.REQUEST_PRESENTATION),
         request=request,
         subject=subject,
     )
diff --git a/acesta/templates/base.html b/acesta/templates/base.html
@@ -40,7 +40,7 @@
   </head>
   <body>
     {% block modals %}
-      {% request_modal request=request subject=REQUEST_CONSULTATION %}
+      {% request_modal request=request user=request.user subject=REQUEST_CONSULTATION %}
     {% endblock %}
 
     {% block body %}{% endblock %}

diff --git a/acesta/templates/include/request_modal.html b/acesta/templates/include/request_modal.html
@@ -3,7 +3,7 @@
   <div class="modal fade" id="{{ subject }}" tabindex="-1" role="dialog" aria-labelledby="requestLabel" aria-hidden="true">
     <div class="modal-dialog modal-dialog-centered" role="document">
       <div class="modal-content">
-        <form action="{% url 'request' %}" method="post" class="has-masked">
+        <form action="{% url 'visitor_request' %}" method="post" class="has-masked">
           <div class="modal-header bg-accent">
             <h5 class="modal-title" id="{{ subject }}Label"><svg fill="#464646" class="me-2" width="32" height="32"><use href="{% static 'img/sprite.svg' %}#help"></use></svg>Запрос {% if subject == REQUEST_CONSULTATION %}консультации{% else %}презентации{% endif %}</h5>
             <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>

diff --git a/acesta/templates/index.html b/acesta/templates/index.html
@@ -9,7 +9,7 @@
 
 {% block modals %}
   {{ block.super }}
-  {% request_modal request=request subject="presentation" %}
+  {% request_modal request=request user=request.user subject="presentation" %}
 {% endblock %}
 
 {% block body %}

diff --git a/acesta/templates/outside.html b/acesta/templates/outside.html
@@ -4,7 +4,7 @@
 
 {% block modals %}
   {{ block.super }}
-  {% request_modal request=request subject="presentation" %}
+  {% request_modal request=request user=request.user subject="presentation" %}
 {% endblock %}
 
 {% block body %}

diff --git a/acesta/user/urls.py b/acesta/user/urls.py
@@ -103,7 +103,7 @@
     path("user/<str:code>/", login_required(user_profile), name="user"),
     path("user/", login_required(user_profile), name="user"),
     path("price/", login_required(price), name="price"),
-    path("request/", visitor_request, name="request"),
+    path("request/", visitor_request, name="visitor_request"),
     path("support/", login_required(support), name="support"),
     path("offer/", login_required(offer), name="offer"),
     path("offer_report/", login_required(offer_report), name="offer_report"),