QueryFiddle: reset sorting when executing query. fixes #33

hailocab · Jan 23, 2014 · 82fe6f6 · 82fe6f6
1 parent c05cf29
commit 82fe6f6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/rd_ui/app/scripts/query_fiddle/renderers.js b/rd_ui/app/scripts/query_fiddle/renderers.js
@@ -123,7 +123,7 @@ renderers.directive('gridRenderer', function () {
                 isPaginationEnabled: true,
                 itemsByPage: $scope.itemsPerPage || 15,
                 maxSize: 8
-            }
+            };
 
             $scope.$watch('queryResult && queryResult.getData()', function (data) {
                 if (!data) {

diff --git a/rd_ui/app/scripts/smart-table.js b/rd_ui/app/scripts/smart-table.js
@@ -113,8 +113,10 @@
 
                     //if item are added or removed into the data model from outside the grid
                     scope.$watch('dataCollection', function (oldValue, newValue) {
-                        if (oldValue !== newValue) {
-                            ctrl.sortBy();//it will trigger the refresh... some hack ?
+                        // evme:
+                        // reset sorting when data updates (executing query again)
+                        if (newValue) {
+                            ctrl.resetSort();
                         }
                     });
 
@@ -496,6 +498,12 @@
                 return scope.isPaginationEnabled ? arrayUtility.fromTo(output, (scope.currentPage - 1) * scope.itemsByPage, scope.itemsByPage) : output;
             };
 
+            this.resetSort = function() {
+                lastColumnSort = null;
+                predicate = {};
+                this.sortBy();
+            };
+
             /*////////////
              Column API
              ///////////*/