chore: feedbacks

MTES-MCT · Feb 19, 2025 · 72a25aa · 72a25aa
1 parent 68aaac4
commit 72a25aa
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 6 deletions.
diff --git a/erp/views.py b/erp/views.py
@@ -663,7 +663,11 @@ def contrib_edit_infos(request, erp_slug):
                 messages.SUCCESS,
                 translate("Les données ont été enregistrées."),
             )
-            return redirect(next_route, erp_slug=erp.slug)
+
+            if "publier" in request.POST and erp.published:
+                return redirect(reverse("contrib_publication", kwargs={"erp_slug": erp.slug}))
+            else:
+                return redirect(next_route, erp_slug=erp.slug)
     else:
         form = forms.PublicErpAdminInfosForm(instance=erp, initial=initial)
 
@@ -679,6 +683,7 @@ def contrib_edit_infos(request, erp_slug):
             "form": form,
             "other_activity": Activite.objects.only("id").get(slug="autre"),
             "suggested_activity": None,
+            "publier_route": reverse("contrib_publication", kwargs={"erp_slug": erp.slug}),
             # Zoom in/out is not permitted in edit mode as it would result into a position change of the cross
             "map_options": json.dumps(
                 {

diff --git a/static/js/ui/FormContribDirtyChecker.js b/static/js/ui/FormContribDirtyChecker.js
@@ -26,7 +26,10 @@ async function FormContribDirtyChecker(root) {
   const cancelBtn = document.querySelector('button#contrib-edit-modal-cancel-btn')
   const saveBtn = document.querySelector('button#contrib-edit-modal-save-btn')
   const closeBtn = document.querySelector('button[aria-controls="contrib-edit-modal-controls"]')
+  const validateBtn = document.querySelector('input#contrib-edit-modal-validate-btn')
+  const publishBtn = document.querySelector('input#contrib-edit-publish-btn')
 
+  console.log({ validateBtn, publishBtn })
   if (
     !root ||
     !dropdown ||
@@ -36,7 +39,9 @@ async function FormContribDirtyChecker(root) {
     !saveBtn ||
     !modal ||
     !openModalBtn ||
-    !closeBtn
+    !closeBtn ||
+    !publishBtn ||
+    !validateBtn
   ) {
     return
   }
@@ -158,7 +163,7 @@ async function FormContribDirtyChecker(root) {
           window.location.assign(redirectionUrl)
         }
       })
-      .catch((e) => {
+      .catch(() => {
         setLocalStorageNotificationError()
       })
       .finally(() => {
@@ -170,6 +175,10 @@ async function FormContribDirtyChecker(root) {
   cancelBtn.addEventListener('click', () => {
     closeBtn.click()
   })
+
+  validateBtn.addEventListener('click', () => {
+    publishBtn.click()
+  })
 }
 
 function setLocalStorageNotificationError() {

diff --git a/templates/contrib/includes/contrib-edit-block.html b/templates/contrib/includes/contrib-edit-block.html
@@ -22,9 +22,14 @@
             </div>
             <div class="fr-col-12 fr-col-md fr-grid-row fr-col--bottom fr-grid-row--right">
                 <button id="contrib-edit-open-btn"
-                        class="fr-btn"
+                        class="fr-btn hidden"
                         aria-controls="contrib-edit-modal-controls"
-                        data-fr-opened="false">{% translate "Valider les modifications" %}</button>
+                        data-fr-opened="false"></button>
+                <input id="contrib-edit-modal-validate-btn"
+                       type="submit"
+                       class="fr-btn"
+                       name="publier"
+                       value="{% translate "Valider et publier" %}">
             </div>
         </div>
     </div>

diff --git a/templates/contrib/includes/prevnext.html b/templates/contrib/includes/prevnext.html
@@ -18,7 +18,8 @@
         {% endif %}
         {% if publier_route %}
             <li>
-                <input type="submit"
+                <input id="contrib-edit-publish-btn"
+                       type="submit"
                        class="{% if next_step_title %}fr-btn fr-btn--secondary {% else %}fr-btn btn-primary{% endif %}"
                        name="publier"
                        value='{% translate "Publier" %}'>