Kouhei Sutou
null+****@clear*****
Tue Nov 4 15:12:20 JST 2014
Kouhei Sutou 2014-11-04 15:12:20 +0900 (Tue, 04 Nov 2014) New Revision: 1c44be6b1bcf0969afea40d52547eb1f9c3a05b7 https://github.com/groonga/groonga-admin/commit/1c44be6b1bcf0969afea40d52547eb1f9c3a05b7 Message: Extract common code Modified files: app/scripts/controllers/table-search-controller.js Modified: app/scripts/controllers/table-search-controller.js (+12 -8) =================================================================== --- app/scripts/controllers/table-search-controller.js 2014-11-04 15:10:16 +0900 (4999468) +++ app/scripts/controllers/table-search-controller.js 2014-11-04 15:12:20 +0900 (9490712) @@ -56,11 +56,20 @@ angular.module('groongaAdminApp') $location.search({}); } + function addOutputColumn(name) { + var outputColumns = $scope.parameters.output_columns; + var inUse = true; + if (outputColumns) { + inUse = outputColumns.indexOf(name) !== -1; + } + $scope.outputColumns.push({name: name, inUse: inUse}); + } + function extractTableInfo(table) { if (table.name === $scope.table) { - $scope.outputColumns.push({name: '_id', inUse: true}); + addOutputColumn('_id'); if (table.hasKey) { - $scope.outputColumns.push({name: '_key', inUse: true}); + addOutputColumn('_key'); } } @@ -72,16 +81,11 @@ angular.module('groongaAdminApp') function extractColumnsInfo(table, columns) { if (table.name === $scope.table) { - var outputColumns = $scope.parameters.output_columns; columns.forEach(function(column) { if (column.isIndex) { return; } - var inUse = true; - if (outputColumns) { - inUse = outputColumns.indexOf(column.name) !== -1; - } - $scope.outputColumns.push({name: column.name, inUse: inUse}); + addOutputColumn(column.name); }); } -------------- next part -------------- HTML����������������������������...下載
