Merge branch 'redmine-issues/14567' into 'develop'

REDMINE_ISSUE-14567

See merge request !470

src/components/Feature/Edit/FeatureExtraForm.vue

 <template>
-  <div
-    v-if="field && field.field_type === 'char'"
-  >
+  <div v-if="field && field.field_type === 'char'">
     <label
-      v-if="$route.name === 'editer-signalement'"
+      v-if="displayLabels"
       :for="field.name"
     >
       {{ field.label }}
@@ -17,11 +15,9 @@
     >
   </div>
 
-  <div
-    v-else-if="field && field.field_type === 'list'"
-  >
+  <div v-else-if="field && field.field_type === 'list'">
     <label
-      v-if="$route.name === 'editer-signalement'"
+      v-if="displayLabels"
       :for="field.name"
     >
       {{ field.label }}
@@ -32,11 +28,9 @@
       :selection.sync="selected_extra_form_list"
     />
   </div>
-  <div
-    v-else-if="field && field.field_type === 'integer'"
-  >
+  <div v-else-if="field && field.field_type === 'integer'">
     <label
-      v-if="$route.name === 'editer-signalement'"
+      v-if="displayLabels"
       :for="field.name"
     >
       {{ field.label }}
@@ -52,9 +46,7 @@
       >
     </div>
   </div>
-  <div
-    v-else-if="field && field.field_type === 'boolean'"
-  >
+  <div v-else-if="field && field.field_type === 'boolean'">
     <div class="ui checkbox">
       <input
         :id="field.name"
@@ -64,15 +56,13 @@
         @change="updateStore_extra_form"
       >
       <label :for="field.name">
-        {{ $route.name === 'editer-signalement' ? field.label : '' }}
+        {{ displayLabels ? field.label : '' }}
       </label>
     </div>
   </div>
-  <div
-    v-else-if="field && field.field_type === 'date'"
-  >
+  <div v-else-if="field && field.field_type === 'date'">
     <label
-      v-if="$route.name === 'editer-signalement'"
+      v-if="displayLabels"
       :for="field.name"
     >
       {{ field.label }}
@@ -85,11 +75,9 @@
       @blur="updateStore_extra_form"
     >
   </div>
-  <div
-    v-else-if="field && field.field_type === 'decimal'"
-  >
+  <div v-else-if="field && field.field_type === 'decimal'">
     <label
-      v-if="$route.name === 'editer-signalement'"
+      v-if="displayLabels"
       :for="field.name"
     >
       {{ field.label }}
@@ -105,11 +93,9 @@
       >
     </div>
   </div>
-  <div
-    v-else-if="field && field.field_type === 'text'"
-  >
+  <div v-else-if="field && field.field_type === 'text'">
     <label
-      v-if="$route.name === 'editer-signalement'"
+      v-if="displayLabels"
       :for="field.name"
     >
       {{ field.label }}
@@ -152,6 +138,10 @@ export default {
         this.$store.commit('feature/UPDATE_EXTRA_FORM', newExtraForm);
       },
     },
+
+    displayLabels() {
+      return this.$route.name === 'editer-signalement' || this.$route.name === 'ajouter-signalement';
+    }
   },
 
   methods: {

src/views/Feature/FeatureEdit.vue

@@ -264,11 +264,11 @@
       <div
         v-for="(field, index) in orderedCustomFields"
         :key="field.field_type + index"
-        class="field"
       >
         <FeatureExtraForm
           :id="field.label"
           :field="field"
+          class="field"
         />
         {{ field.errors }}
       </div>