Merge pull request #207 from ottemo/awk_hotfix_order-id-filtering

order id filtering bug
ottemo · Nov 18, 2015 · fc64554 · fc64554
2 parents 19e9a0e + 6dca190
commit fc64554
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,7 @@
 *.sublime-workspace
 
 app/bower_components
+app/scripts/main.js
 app/bundle.js
 app/media
 dist

diff --git a/app/scripts/design/directives/guiTableManager.js b/app/scripts/design/directives/guiTableManager.js
@@ -104,7 +104,9 @@ angular.module("designModule")
                  */
                 saveCurrentActiveFilters = function (filterDetails) {
                     if (filterDetails.filterValue) {
-                        if (-1 !== ['text', 'string', 'varchar'].indexOf(filterDetails.dataType)) {
+                        //REFACTOR: dataType is actually assigned by a request for attribute information from the server,
+                        // and apparently id is it's own type
+                        if (-1 !== ['text', 'string', 'varchar', 'id'].indexOf(filterDetails.dataType)) {
                             activeFilters[filterDetails.attribute.toLowerCase()] = filterDetails.filterValue.replace(/~/g, "").split(",");
                         } else {
                             activeFilters[filterDetails.attribute.toLowerCase()] = filterDetails.filterValue.replace(/~/g, "");

diff --git a/gulpfile.js b/gulpfile.js
@@ -114,7 +114,7 @@ gulp.task('replace', function () {
 
 // Empties folders to start fresh
 gulp.task('clean', function () {
-    return del(['dist']);
+    return del(['dist','app/scripts/config.js']);
 });
 
 gulp.task('jshint', function () {