From 4aa6342327835053fc302eb4ea4557f5c134fb6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Poussard?= <tpoussard@neogeo.fr>
Date: Thu, 9 Sep 2021 14:49:07 +0200
Subject: [PATCH] add default text to dropdown for colors_style if no selection
 & disable clear selection if not in search mode

---
 src/components/Dropdown.vue                  | 9 ++++++---
 src/views/feature_type/Feature_type_edit.vue | 2 +-
 src/views/project/Project_edit.vue           | 1 -
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/components/Dropdown.vue b/src/components/Dropdown.vue
index 317ba838..24b352ab 100644
--- a/src/components/Dropdown.vue
+++ b/src/components/Dropdown.vue
@@ -18,7 +18,8 @@
       v-model="input"
       :placeholder="placeholder"
     />
-    <div v-if="!placeholder" class="default text">{{ selected }}</div>
+    <!-- {{placeholder}} -->
+    <div class="default text">{{ selected || placeholder }}</div>
     <i
       :class="['dropdown icon', { clear: search && selected }]"
       @click="clear"
@@ -80,8 +81,10 @@ export default {
       );
     },
     clear() {
-      this.input = "";
-      this.clearSelected();
+      if (this.search) {
+        this.input = "";
+        this.clearSelected();
+      }
     },
     clearSelected() {
       this.$emit("update:selection", "");
diff --git a/src/views/feature_type/Feature_type_edit.vue b/src/views/feature_type/Feature_type_edit.vue
index df2167a7..63f12f1b 100644
--- a/src/views/feature_type/Feature_type_edit.vue
+++ b/src/views/feature_type/Feature_type_edit.vue
@@ -81,6 +81,7 @@
               :options="colorsStyleOptions"
               :selected="selected_colors_style"
               :selection.sync="selected_colors_style"
+              :placeholder="'Sélectionner la liste de valeurs'"
             />
           </div>
           <div class="colors_selection" id="id_colors_selection" hidden>
@@ -200,7 +201,6 @@ export default {
           id_for_label: "geom_type",
           label: "Type de géométrie",
           field: {
-            //choices: ["Ligne", "Point", "Polygone"],
             max_length: 128, // ! Vérifier la valeur dans django
           },
           html_name: "geom_type",
diff --git a/src/views/project/Project_edit.vue b/src/views/project/Project_edit.vue
index d412c04f..f40bf7d9 100644
--- a/src/views/project/Project_edit.vue
+++ b/src/views/project/Project_edit.vue
@@ -189,7 +189,6 @@ export default {
         updated_on: "",
         description: "",
         moderation: false,
-        //thumbnail: "https://via.placeholder.com/150", // todo : utiliser l'image par défaut
         thumbnail: require("@/assets/img/default.png"), // todo : utiliser l'image par défaut
         thumbnail_name: "", // todo: delete after getting image in jpg or png instead of data64 (require post to django)
         creator: null,
-- 
GitLab