Kouhei Sutou
null+****@clear*****
Fri Nov 7 17:50:21 JST 2014
Kouhei Sutou 2014-11-07 17:50:21 +0900 (Fri, 07 Nov 2014) New Revision: b6ecc0477a19b8ab17b7e30b8dd62e1925899682 https://github.com/groonga/groonga-admin/commit/b6ecc0477a19b8ab17b7e30b8dd62e1925899682 Message: Simplify Modified files: app/scripts/controllers/table-search-controller.js Modified: app/scripts/controllers/table-search-controller.js (+8 -10) =================================================================== --- app/scripts/controllers/table-search-controller.js 2014-11-07 17:46:53 +0900 (015b10d) +++ app/scripts/controllers/table-search-controller.js 2014-11-07 17:50:21 +0900 (c5ca203) @@ -41,25 +41,23 @@ angular.module('groongaAdminApp') $scope.selectDrilldown = selectDrilldown; } - function packColumns(columns, filterFunction) { - var targetColumnNames = columns - .filter(filterFunction) - .map(function(column) { - return column.name; - }); + function packColumns(columns) { + var targetColumnNames = columns.map(function(column) { + return column.name; + }); return targetColumnNames.join(','); } function search() { var parameters = angular.copy($scope.parameters); parameters.match_columns = - packColumns($scope.indexedColumns, function(column) { + packColumns($scope.indexedColumns.filter(function(column) { return column.inUse; - }); + })); parameters.output_columns = - packColumns($scope.allColumns, function(column) { + packColumns($scope.allColumns.filter(function(column) { return column.output; - }); + })); parameters.offset = ($scope.currentPage - 1) * $scope.nRecordsInPage; parameters.limit = $scope.nRecordsInPage; var sortKeys = $scope.columns.filter(function(column) { -------------- next part -------------- HTML����������������������������...Download