Merge pull request #352 from romfabbro/hot_fix

Hot fix: Export : fix In operator
naturalsolutions · Oct 12, 2016 · 8811c80 · 8811c80
2 parents 49f49f0 + 256841f
commit 8811c80
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git 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
@@ -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",