Kouhei Sutou
null+****@clear*****
Fri Nov 7 17:51:21 JST 2014
Kouhei Sutou 2014-11-07 17:51:21 +0900 (Fri, 07 Nov 2014) New Revision: 59e117faf0794b9f223c754465520ea347a63f03 https://github.com/groonga/groonga-admin/commit/59e117faf0794b9f223c754465520ea347a63f03 Message: Clean up Modified files: app/scripts/controllers/table-search-controller.js Modified: app/scripts/controllers/table-search-controller.js (+13 -8) =================================================================== --- app/scripts/controllers/table-search-controller.js 2014-11-07 17:50:21 +0900 (c5ca203) +++ app/scripts/controllers/table-search-controller.js 2014-11-07 17:51:21 +0900 (363b8f1) @@ -50,16 +50,20 @@ angular.module('groongaAdminApp') function search() { var parameters = angular.copy($scope.parameters); - parameters.match_columns = - packColumns($scope.indexedColumns.filter(function(column) { - return column.inUse; - })); - parameters.output_columns = - packColumns($scope.allColumns.filter(function(column) { - return column.output; - })); + + var matchColumns = $scope.indexedColumns.filter(function(column) { + return column.inUse; + }); + parameters.match_columns = packColumns(matchColumns); + + var outputColumns = $scope.allColumns.filter(function(column) { + return column.output; + }); + parameters.output_columns = packColumns(outputColumns); + parameters.offset = ($scope.currentPage - 1) * $scope.nRecordsInPage; parameters.limit = $scope.nRecordsInPage; + var sortKeys = $scope.columns.filter(function(column) { return column.sort; }).map(function(column) { @@ -70,6 +74,7 @@ angular.module('groongaAdminApp') } }).join(','); parameters.sortby = sortKeys; + $location.search(parameters); } -------------- next part -------------- HTML����������������������������...下載
