From edbbd657e96ed56eb333188702ad7755671d1c7a Mon Sep 17 00:00:00 2001
From: Armand Bahi <armand.bahi@veremes.com>
Date: Wed, 23 Jan 2019 09:51:31 +0100
Subject: [PATCH] Review Armand
---
.../vmap_business_object_vmap_business_object.json | 3 ++-
src/module_vmap/module/lang/lang-en.json | 2 +-
src/module_vmap/module/lang/lang-fr.json | 2 +-
src/module_vmap/web_service/sql/sqlQueries.xml | 2 ++
4 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/module_vmap/module/forms/vmap_business_object/vmap_business_object_vmap_business_object.json b/src/module_vmap/module/forms/vmap_business_object/vmap_business_object_vmap_business_object.json
index 4d4b9a04..7dea0252 100644
--- a/src/module_vmap/module/forms/vmap_business_object/vmap_business_object_vmap_business_object.json
+++ b/src/module_vmap/module/forms/vmap_business_object/vmap_business_object_vmap_business_object.json
@@ -544,7 +544,8 @@
"name": "location_placeholder",
"label": "FORM_LOCATION_PLACEHOLDER_VMAP_BUSINESS_OBJECT",
"nb_cols": 4,
- "id": "bo_location_placeholder"
+ "id": "bo_location_placeholder",
+ "default_value": "Localiser..."
},
{
"type": "radio",
diff --git a/src/module_vmap/module/lang/lang-en.json b/src/module_vmap/module/lang/lang-en.json
index 8c8e2535..1886712e 100644
--- a/src/module_vmap/module/lang/lang-en.json
+++ b/src/module_vmap/module/lang/lang-en.json
@@ -190,7 +190,7 @@
"FORM_LOCATABLE_VMAP_BUSINESS_OBJECT": "Enable locate",
"FORM_LOCATABLE_VMAP_BUSINESS_OBJECT_TOOLTIP": "Display the object on the locate tool",
"LIST_DELETE_CONFIRM_VMAP_BUSINESS_OBJECT": "Delete the selected items and associations with layers?",
- "FORM_LOCATION_PLACEHOLDER_VMAP_BUSINESS_OBJECT": "Location title",
+ "FORM_LOCATION_PLACEHOLDER_VMAP_BUSINESS_OBJECT": "Location placeholder",
"": "",
"FORM_TITLE_VMAP_MODULE_MODULE": "Module {{::label}}",
"FORM_LABEL_VMAP_MODULE_MODULE": "Label",
diff --git a/src/module_vmap/module/lang/lang-fr.json b/src/module_vmap/module/lang/lang-fr.json
index 78fa1211..0ac88683 100644
--- a/src/module_vmap/module/lang/lang-fr.json
+++ b/src/module_vmap/module/lang/lang-fr.json
@@ -190,7 +190,7 @@
"FORM_LOCATABLE_VMAP_BUSINESS_OBJECT": "Objet localisable",
"FORM_LOCATABLE_VMAP_BUSINESS_OBJECT_TOOLTIP": "Affiche l'objet dans la liste de l'outil de localisation (ne garantit pas la sécurité de la donnée)",
"LIST_DELETE_CONFIRM_VMAP_BUSINESS_OBJECT": "Supprimer les objets métiers sélectionnés et les associations avec les calques ?",
- "FORM_LOCATION_PLACEHOLDER_VMAP_BUSINESS_OBJECT": "Titre de la localisation",
+ "FORM_LOCATION_PLACEHOLDER_VMAP_BUSINESS_OBJECT": "Balise du champ localisation",
"": "",
"FORM_TITLE_VMAP_MODULE_MODULE": "Module {{::label}}",
"FORM_LABEL_VMAP_MODULE_MODULE": "Libellé",
diff --git a/src/module_vmap/web_service/sql/sqlQueries.xml b/src/module_vmap/web_service/sql/sqlQueries.xml
index 10d6a568..4a1e026e 100644
--- a/src/module_vmap/web_service/sql/sqlQueries.xml
+++ b/src/module_vmap/web_service/sql/sqlQueries.xml
@@ -1166,6 +1166,8 @@
UPDATE s_vmap.business_object SET enable_selection=true, enable_location=true;
-- Frédéric 18/01/2019 Placeholder dans la localisation
ALTER TABLE s_vmap.business_object ADD COLUMN location_placeholder character varying(100);
+ -- Armand 23/01/2019 Placeholder dans la localisation
+ UPDATE s_vmap.business_object set location_placeholder='Localiser...';
]]>
</code>
</query>
--
GitLab