From 81a31c283156ba30eabebd23d2d1182c333e7b7e Mon Sep 17 00:00:00 2001 From: romfabbro Date: Wed, 12 Oct 2016 12:44:56 +0200 Subject: [PATCH] fix "In" operator in export Bower install is needed --- Front/app/modules/export/lyt-export-step2.js | 13 ++++++++----- Front/bower.json | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Front/app/modules/export/lyt-export-step2.js b/Front/app/modules/export/lyt-export-step2.js index d89931c3c..896d84dce 100644 --- a/Front/app/modules/export/lyt-export-step2.js +++ b/Front/app/modules/export/lyt-export-step2.js @@ -74,14 +74,17 @@ define([ getValueOptions: function (DataRow) { var valueOptions; switch (DataRow['type']) { - case "Select": case 'Checkboxes': - return DataRow['options'] + case "Select": + return DataRow['options']; + break; + case 'Checkboxes': + return DataRow['options']; break; case 'AutocompTreeEditor': - return DataRow['options'] + return DataRow['options']; break; case 'AutocompleteEditor': - return DataRow['options'] + return DataRow['options']; break; case "DATETIME": return valueOptions = [{ @@ -91,7 +94,7 @@ define([ break; case "DateTimePickerEditor" : DataRow['options'].format = "DD/MM/YYYY"; - return DataRow['options'] + return DataRow['options']; break; default: return valueOptions = DataRow['options']; diff --git a/Front/bower.json b/Front/bower.json index 51a643324..d703539ab 100644 --- a/Front/bower.json +++ b/Front/bower.json @@ -29,7 +29,7 @@ "tooltipster": "3.3.0", "chartjs": "1.0.2", "reneco-fonts": "*", - "NaturalJS_Filter":"1.1.1" + "NaturalJS_Filter":"1.1.4" }, "resolutions": { "jquery": "1.10.2",