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

REDMINE_ISSUE-12634 | Biblio de pictos - Signalements ponctuels, ne fonctionne pas

See merge request !202

src/components/feature_type/SymbologySelector.vue

@@ -114,7 +114,7 @@ export default {
 
   created() {
     this.form.color.value = this.initColor;
-    this.form.icon = this.initIcon;
+    if (this.initIcon) this.form.icon = this.initIcon;
     this.$emit('set', {
       name: this.title,
       value: this.form

src/views/feature_type/Feature_type_symbology.vue

@@ -23,6 +23,7 @@
         <SymbologySelector
           v-if="feature_type"
           :initColor="feature_type.color"
+          :initIcon="feature_type.icon"
           :geomType="feature_type.geom_type"
           @set="setDefaultStyle"
         />
@@ -60,7 +61,9 @@
           >
             <SymbologySelector
               :title="option"
-              :initColor="feature_type.colors_style.value.colors[option].value"
+              :initColor="feature_type.colors_style.value.colors[option] ?
+                feature_type.colors_style.value.colors[option].value :
+                feature_type.colors_style.value.colors[option]"
               :initIcon="feature_type.colors_style.value.icons[option]"
               :geomType="feature_type.customfield_set.geomType"
               @set="setColorsStyle"

src/views/project/Project_detail.vue

@@ -221,15 +221,15 @@
                   <div v-else v-frag>
                   <router-link
                     :to="{
-                      name: 'editer-type-signalement',
+                      name: 'editer-symbologie-signalement',
                       params: { slug_type_signal: type.slug },
                     }"
                     v-if="
                       project &&
-                      type.is_editable &&
+                      type.geom_type === 'point' &&
                       permissions &&
                       permissions.can_create_feature_type &&
-                      isOffline() !== true
+                      isOffline() != true
                     "
                     class="
                       ui
@@ -240,24 +240,23 @@
                       floated
                       button button-hover-green
                     "
-                    data-tooltip="Éditer le type de signalement"
+                    data-tooltip="Éditer la symbologie du type de signalement"
                     data-position="left center"
                     data-variation="mini"
                   >
-                    <i class="inverted grey pencil alternate icon"></i>
+                    <i class="inverted grey paint brush alternate icon"></i>
                   </router-link>
                   <router-link
                     :to="{
-                      name: 'editer-symbologie-signalement',
+                      name: 'editer-type-signalement',
                       params: { slug_type_signal: type.slug },
                     }"
                     v-if="
                       project &&
                       type.is_editable &&
-                      type.geom_type === 'point' &&
                       permissions &&
                       permissions.can_create_feature_type &&
-                      isOffline() != true
+                      isOffline() !== true
                     "
                     class="
                       ui
@@ -268,11 +267,11 @@
                       floated
                       button button-hover-green
                     "
-                    data-tooltip="Éditer la symbologie du type de signalement"
+                    data-tooltip="Éditer le type de signalement"
                     data-position="left center"
                     data-variation="mini"
                   >
-                    <i class="inverted grey paint brush alternate icon"></i>
+                    <i class="inverted grey pencil alternate icon"></i>
                   </router-link>
                   </div>
                 </div>