From 7c9b482f5811466e46bee4e977b5857a46151b94 Mon Sep 17 00:00:00 2001
From: Andrej <andrej@scinote.net>
Date: Thu, 16 Jan 2025 09:20:25 +0100
Subject: [PATCH] Fix form moving between steps [SCI-11461]

---
 app/javascript/vue/forms/fields/datetime.vue        | 1 +
 app/javascript/vue/shared/content/form_response.vue | 5 ++++-
 app/javascript/vue/shared/content/mixins/move.js    | 8 ++++----
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/javascript/vue/forms/fields/datetime.vue b/app/javascript/vue/forms/fields/datetime.vue
index 58c01b0e1..15aa25480 100644
--- a/app/javascript/vue/forms/fields/datetime.vue
+++ b/app/javascript/vue/forms/fields/datetime.vue
@@ -11,6 +11,7 @@
           :placeholder="fieldDisabled ? '' : i18n.t('forms.fields.from')"
           :class="{'error': !validValue}"
         />
+        -
         <DateTimePicker
           @change="updateToDate"
           :defaultValue="toValue"
diff --git a/app/javascript/vue/shared/content/form_response.vue b/app/javascript/vue/shared/content/form_response.vue
index 92474dc00..8d3cf2411 100644
--- a/app/javascript/vue/shared/content/form_response.vue
+++ b/app/javascript/vue/shared/content/form_response.vue
@@ -86,7 +86,8 @@ export default {
       form: this.element.attributes.orderable.form,
       formResponse: this.element.attributes.orderable,
       formFieldValues: this.element.attributes.orderable.form_field_values,
-      deleteUrl: this.element.attributes.orderable.urls.delete_url
+      deleteUrl: this.element.attributes.orderable.urls.delete_url,
+      moveUrl: this.element.attributes.orderable.urls.move_url
     };
   },
   mounted() {
@@ -159,6 +160,7 @@ export default {
         const { attributes } = response.data.data;
         this.formResponse = attributes.orderable;
         this.deleteUrl = attributes.orderable.urls.delete_url;
+        this.moveUrl = attributes.orderable.urls.move_url;
       });
     },
     resetForm() {
@@ -166,6 +168,7 @@ export default {
         const { attributes } = response.data.data;
         this.formResponse = attributes.orderable;
         this.deleteUrl = attributes.orderable.urls.delete_url;
+        this.moveUrl = attributes.orderable.urls.move_url;
       });
     }
   }
diff --git a/app/javascript/vue/shared/content/mixins/move.js b/app/javascript/vue/shared/content/mixins/move.js
index d761f4c7b..02c8466cf 100644
--- a/app/javascript/vue/shared/content/mixins/move.js
+++ b/app/javascript/vue/shared/content/mixins/move.js
@@ -13,11 +13,11 @@ export default {
     closeMoveModal() {
       this.movingElement = false;
     },
-    moveElement(target_id) {
-      axios.post(this.element.attributes.orderable.urls.move_url, { target_id: target_id }).
-        then(() => {
+    moveElement(targetId) {
+      axios.post(this.moveUrl || this.element.attributes.orderable.urls.move_url, { target_id: targetId })
+        .then(() => {
           this.movingElement = false;
-          this.$emit('moved', this.element.attributes.position, target_id);
+          this.$emit('moved', this.element.attributes.position, targetId);
         });
     }
   }