From bda76d6e58955759dd996ad65535d51d1a52dbf5 Mon Sep 17 00:00:00 2001
From: Armand Bahi <armand.bahi@veremes.com>
Date: Tue, 13 Nov 2018 14:36:48 +0100
Subject: [PATCH] =?UTF-8?q?Am=C3=A9lioration=20forlulaire=20objet=20m?=
=?UTF-8?q?=C3=A9tier=20fix=20#9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
...ap_business_object_vmap_business_object.js | 5 +++
..._business_object_vmap_business_object.json | 38 +++++++++++++++----
2 files changed, 35 insertions(+), 8 deletions(-)
diff --git a/src/module_vmap/module/forms/vmap_business_object/vmap_business_object_vmap_business_object.js b/src/module_vmap/module/forms/vmap_business_object/vmap_business_object_vmap_business_object.js
index 80ce2724..6a1ab146 100644
--- a/src/module_vmap/module/forms/vmap_business_object/vmap_business_object_vmap_business_object.js
+++ b/src/module_vmap/module/forms/vmap_business_object/vmap_business_object_vmap_business_object.js
@@ -250,6 +250,11 @@ var oFormScope;
oFormValues['id_field']['options'] = aColumnsOptions;
}
}
+ if (angular.isDefined(oFormValues['sorted_by'])) {
+ if (angular.isDefined(oFormValues['sorted_by']['options'])) {
+ oFormValues['sorted_by']['options'] = aColumnsOptions;
+ }
+ }
if (angular.isDefined(oFormValues['geom_column'])) {
if (angular.isDefined(oFormValues['geom_column']['options'])) {
oFormValues['geom_column']['options'] = aColumnsOptions;
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 17dbe046..e0168f15 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
@@ -280,13 +280,24 @@
},
{
"fields": [{
- "type": "text",
+ "type": "editable_select",
"name": "sorted_by",
"label": "FORM_SORTED_BY_DEVELOPMENT_0",
"required": false,
- "pattern": "",
- "nb_cols": 6,
- "id": "New_el_9_11_1"
+ "nb_cols": 5
+ }, {
+ "type": "button",
+ "class": "btn-group btn-group-sm margin-top-20",
+ "nb_cols": 1,
+ "buttons": [{
+ "type": "button",
+ "name": "table-datalist",
+ "label": "FORM_SORTED_BY_DEVELOPMENT_0",
+ "class": "btn-primary",
+ "event": "loadVMapBoFormColumns()",
+ "glyphicon": "refresh"
+ }
+ ]
}]
},
{
@@ -709,13 +720,24 @@
},
{
"fields": [{
- "type": "text",
+ "type": "editable_select",
"name": "sorted_by",
"label": "FORM_SORTED_BY_DEVELOPMENT_0",
"required": false,
- "pattern": "",
- "nb_cols": 6,
- "id": "New_el_9_11_1"
+ "nb_cols": 5
+ }, {
+ "type": "button",
+ "class": "btn-group btn-group-sm margin-top-20",
+ "nb_cols": 1,
+ "buttons": [{
+ "type": "button",
+ "name": "table-datalist",
+ "label": "FORM_SORTED_BY_DEVELOPMENT_0",
+ "class": "btn-primary",
+ "event": "loadVMapBoFormColumns()",
+ "glyphicon": "refresh"
+ }
+ ]
}]
},
{
--
GitLab