Fix issue when first loading persisting data (filterTable)

PlacidCH · Sep 5, 2017 · 5db2074 · 5db2074
1 parent c614940
commit 5db2074
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/dist/js/SmlAppl.WebApps.NgFramework.js b/dist/js/SmlAppl.WebApps.NgFramework.js
@@ -3074,7 +3074,7 @@ angular.module('smlAppl.webApps.framework.filterTable').run(['$templateCache', f
                             TemplateUrl: "./src/Scripts/app/FilterTable/Views/FilterConditionalNumber.html",
                             Controller: "FilterTableModalConditionalSelectCtrl",
                             Tooltip: ft.Translations.FilterTable_Conditional_Filter,
-                            Selected: {},
+                            Selected: [],
                             FnFilter: function (item, col) {
                                 if (this.Selected.length === 0) {
                                     return true;
@@ -3149,7 +3149,7 @@ angular.module('smlAppl.webApps.framework.filterTable').run(['$templateCache', f
                             TemplateUrl: "./src/Scripts/app/FilterTable/Views/FilterConditionalDate.html",
                             Controller: "FilterTableModalConditionalSelectCtrl",
                             Tooltip: ft.Translations.FilterTable_Conditional_Filter,
-                            Selected: {},
+                            Selected: [],
                             FnFilter: function (item, col) {
                                 if (this.Selected.length === 0) {
                                     return true;

diff --git a/dist/js/SmlAppl.WebApps.NgFramework.min.js b/dist/js/SmlAppl.WebApps.NgFramework.min.js
diff --git a/src/Scripts/app/FilterTable/Config/templates.js b/src/Scripts/app/FilterTable/Config/templates.js
@@ -248,7 +248,7 @@ angular.module('smlAppl.webApps.framework.filterTable').run(['$templateCache', f
     "\n" +
     "                <select class=\"form-control\" ng-model=\"conditionalFilterItem.condition\">\r" +
     "\n" +
-    "                    <option value=\"==\">==</option>\r" +
+    "                    <option value=\"==\">=</option>\r" +
     "\n" +
     "                    <option value=\"!=\">!=</option>\r" +
     "\n" +

diff --git a/src/Scripts/app/FilterTable/Factories/filterTableFactory.js b/src/Scripts/app/FilterTable/Factories/filterTableFactory.js
@@ -1052,7 +1052,7 @@
                             TemplateUrl: "./src/Scripts/app/FilterTable/Views/FilterConditionalNumber.html",
                             Controller: "FilterTableModalConditionalSelectCtrl",
                             Tooltip: ft.Translations.FilterTable_Conditional_Filter,
-                            Selected: {},
+                            Selected: [],
                             FnFilter: function (item, col) {
                                 if (this.Selected.length === 0) {
                                     return true;
@@ -1127,7 +1127,7 @@
                             TemplateUrl: "./src/Scripts/app/FilterTable/Views/FilterConditionalDate.html",
                             Controller: "FilterTableModalConditionalSelectCtrl",
                             Tooltip: ft.Translations.FilterTable_Conditional_Filter,
-                            Selected: {},
+                            Selected: [],
                             FnFilter: function (item, col) {
                                 if (this.Selected.length === 0) {
                                     return true;