diff --git a/src/components/feature_type/SymbologySelector.vue b/src/components/feature_type/SymbologySelector.vue index 73d5ab4279e35eef88cc55a5d8c209f53da08460..7e730930a5b193d63e737131ce32735c825e764c 100644 --- a/src/components/feature_type/SymbologySelector.vue +++ b/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 diff --git a/src/views/feature_type/Feature_type_symbology.vue b/src/views/feature_type/Feature_type_symbology.vue index f1d82fe21f8c5f0471e52bc4b8dd09090414b227..67d0c7efa1956e69ced868544e0cc3702da6071f 100644 --- a/src/views/feature_type/Feature_type_symbology.vue +++ b/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" diff --git a/src/views/project/Project_detail.vue b/src/views/project/Project_detail.vue index 7889b4a313bd85bcc42e31a6fcee0cb109b7743e..4c402c8b05c0c2ea0ddfcd5eef3101a0a3db5c80 100644 --- a/src/views/project/Project_detail.vue +++ b/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>