Masafumi Yokoyama
null+****@clear*****
Thu Feb 18 00:33:33 JST 2016
Masafumi Yokoyama 2016-02-18 00:33:33 +0900 (Thu, 18 Feb 2016) New Revision: 97caec2f589f536d4da8099831ad20c98bf26915 https://github.com/groonga/grafana-datasource-plugin-groonga/commit/97caec2f589f536d4da8099831ad20c98bf26915 Message: Reuse response Modified files: query_ctrl.js Modified: query_ctrl.js (+5 -19) =================================================================== --- query_ctrl.js 2016-02-15 23:52:22 +0900 (11ff730) +++ query_ctrl.js 2016-02-18 00:33:33 +0900 (f5d5fed) @@ -6,18 +6,15 @@ function (angular) { var module = angular.module('grafana.controllers'); - module.controller('GroongaQueryCtrl', function ($scope, backendSrv, $httpParamSerializerJQLike) { - function params(data) { - return $httpParamSerializerJQLike(data); - } - + module.controller('GroongaQueryCtrl', function ($scope, backendSrv) { $scope.init = function () { var selectOptions = {}; var options = { url: $scope.datasource.datasource.url + '/d/schema' }; return backendSrv.datasourceRequest(options).then(function(response) { - var tables = response.data[1].tables; + $scope.schema = response.data[1]; + var tables = $scope.schema.tables; angular.forEach(tables, function(table, tableName) { var hasTimeColumn = false; var columnName; @@ -36,20 +33,9 @@ function (angular) { $scope.updateTable = function () { $scope.target.table = $scope.table; - var columnListOptions = { - table: $scope.table - } - var options = { - url: $scope.datasource.datasource.url + '/d/column_list?' + params(columnListOptions) - }; - return backendSrv.datasourceRequest(options).then(function(response) { - var columns = response.data[1]; - angular.forEach(columns, function(column) { - var columnName = column[1]; - if (angular.isString(columnName)) { + var columns = $scope.schema.tables[$scope.table].columns; + angular.forEach(columns, function(_, columnName) { $scope.availableColumns.push(columnName); - } - }); }); } -------------- next part -------------- HTML����������������������������...Download