orders on promo text files

bharat-daffodilsw · Jul 23, 2014 · 2fb6428 · 2fb6428
1 parent e6d733a
commit 2fb6428
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/resources/js/promo_text_files.js b/resources/js/promo_text_files.js
@@ -30,7 +30,6 @@ cstore.controller('promoTextFilesCtrl', function ($scope, $appService, $routePar
         $scope.loadingPromoTextFileData = true;
         var query = {"table": "promo_text_files__cstore"};
         query.columns = ["programid", "siteid", "text_files", {"expression": "date", "format": "MM/DD/YYYY"}];
-        query.orders = {"__createdon": "desc"};
         query.filter = {};
         if ($scope.currentUser["data"]) {
             if ($scope.currentUser["data"]["roleid"] == PROGRAMADMIN) {
@@ -50,10 +49,13 @@ cstore.controller('promoTextFilesCtrl', function ($scope, $appService, $routePar
             query.filter["programid._id"] = $scope.filterdata.selectedProgram._id;
         }
         query.orders = {};
-        query.orders["programid.name"] = "asc";
+
         if ($scope.sortingCol && $scope.sortingType) {
             query.orders[$scope.sortingCol] = $scope.sortingType;
         }
+        else {
+            query.orders = {"__createdon": "desc"};
+        }
         query.max_rows = limit;
         query.cursor = $scope.show.currentCursor;
         query.$count = 1;