Kouhei Sutou
null+****@clear*****
Fri Nov 7 17:32:32 JST 2014
Kouhei Sutou 2014-11-07 17:32:32 +0900 (Fri, 07 Nov 2014) New Revision: bc93cd7127455812b734ea6624bb4fcd6161f058 https://github.com/groonga/groonga-admin/commit/bc93cd7127455812b734ea6624bb4fcd6161f058 Message: Revert "Use "show" instead of "inUse"" This reverts commit 2e518b629f362170337318dca7a4c7c78f3d8a32. I want to reconsider about it... Modified files: app/scripts/controllers/table-search-controller.js app/views/tables/search.html Modified: app/scripts/controllers/table-search-controller.js (+10 -10) =================================================================== --- app/scripts/controllers/table-search-controller.js 2014-11-07 17:25:13 +0900 (75d2e56) +++ app/scripts/controllers/table-search-controller.js 2014-11-07 17:32:32 +0900 (95cc70c) @@ -39,10 +39,10 @@ angular.module('groongaAdminApp') $scope.selectDrilldown = selectDrilldown; } - function packShowColumns(columns) { + function packInUseColumns(columns) { var targetColumnNames = columns .filter(function(column) { - return column.show; + return column.inUse; }) .map(function(column) { return column.name; @@ -52,8 +52,8 @@ angular.module('groongaAdminApp') function search() { var parameters = angular.copy($scope.parameters); - parameters.match_columns = packShowColumns($scope.indexedColumns); - parameters.output_columns = packShowColumns($scope.outputColumns); + parameters.match_columns = packInUseColumns($scope.indexedColumns); + parameters.output_columns = packInUseColumns($scope.outputColumns); parameters.offset = ($scope.currentPage - 1) * $scope.nRecordsInPage; parameters.limit = $scope.nRecordsInPage; var sortKeys = $scope.columns.filter(function(column) { @@ -123,14 +123,14 @@ angular.module('groongaAdminApp') function addOutputColumn(name) { var outputColumns = $scope.parameters.output_columns; - var show = true; + var inUse = true; if (outputColumns) { - show = outputColumns.indexOf(name) !== -1; + inUse = outputColumns.indexOf(name) !== -1; } var drilldown = false; $scope.outputColumns.push({ name: name, - show: show, + inUse: inUse, drilldown: drilldown }); } @@ -160,14 +160,14 @@ angular.module('groongaAdminApp') } else { localName = source.split('.')[1]; } - var show = true; + var inUse = true; if (matchColumns) { - show = matchColumns.indexOf(localName) !== -1; + inUse = matchColumns.indexOf(localName) !== -1; } var drilldown = false; $scope.indexedColumns.push({ name: localName, - show: show, + inUse: inUse, drilldown: drilldown }); }); Modified: app/views/tables/search.html (+1 -1) =================================================================== --- app/views/tables/search.html 2014-11-07 17:25:13 +0900 (186dc8f) +++ app/views/tables/search.html 2014-11-07 17:32:32 +0900 (24781d6) @@ -31,7 +31,7 @@ <tr ng-repeat="outputColumn in outputColumns track by $index"> <td>{{outputColumn.name}}</td> <td><input type="checkbox" - ng-model="outputColumn.show"></td> + ng-model="outputColumn.inUse"></td> <td><input type="checkbox" ng-model="outputColumn.drilldown"></td> </tr> -------------- next part -------------- HTML����������������������������...ダウンロード
