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

REDMINE_ISSUE-11954

See merge request !96

src/views/feature/Feature_edit.vue

@@ -173,7 +173,7 @@
         <!-- Extra Fields -->
         <div class="ui horizontal divider">DONNÉES MÉTIER</div>
         <div
-          v-for="(field, index) in extra_form"
+          v-for="(field, index) in orderedCustomFields"
           :key="field.field_type + index"
           class="field"
         >
@@ -367,6 +367,12 @@ export default {
       );
     },
 
+    orderedCustomFields() {
+      return [...this.extra_form].sort(
+        (a, b) => a.position - b.position
+      );
+    },
+
     geoRefFileLabel() {
       if (this.file) {
         return this.file.name;

src/views/feature_type/Feature_type_detail.vue

@@ -35,7 +35,7 @@
           <h3 class="ui header">Champs</h3>
           <div class="ui divided list">
             <div
-              v-for="(field, index) in structure.customfield_set"
+              v-for="(field, index) in orderedCustomFields"
               :key="field.name + index"
               class="item"
             >
@@ -226,6 +226,12 @@ export default {
     lastFeatures: function () {
       return this.feature_type_features.slice(0, 5);
     },
+
+    orderedCustomFields() {
+      return [...this.structure.customfield_set].sort(
+        (a, b) => a.position - b.position
+      );
+    },
   },
 
   methods: {