Repository: ignite Updated Branches: refs/heads/ignite-843-rc2 17c4423e6 -> 229d170c0
IGNITE-2057 Fixed show query dialog. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e2bef80d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e2bef80d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e2bef80d Branch: refs/heads/ignite-843-rc2 Commit: e2bef80de490a14d6386f393e8dfb42a40f496f1 Parents: 8cd5fa0 Author: Andrey <[email protected]> Authored: Wed Dec 2 17:25:55 2015 +0700 Committer: Andrey <[email protected]> Committed: Wed Dec 2 17:25:55 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/sql-controller.js | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/e2bef80d/modules/control-center-web/src/main/js/controllers/sql-controller.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/sql-controller.js b/modules/control-center-web/src/main/js/controllers/sql-controller.js index 781fc2d..7c384bf 100644 --- a/modules/control-center-web/src/main/js/controllers/sql-controller.js +++ b/modules/control-center-web/src/main/js/controllers/sql-controller.js @@ -1469,29 +1469,28 @@ consoleModule.controller('sqlController', function ($scope, $controller, $http, $scope.showResultQuery = function (paragraph) { if ($common.isDefined(paragraph)) { - var title; - var queryMsg; + var scope = $scope.$new(); switch (paragraph.queryArgs.type) { case 'QUERY': - title = 'SQL query'; - queryMsg = paragraph.queryArgs.query; + scope.title = 'SQL query'; + scope.content = [paragraph.queryArgs.query]; break; case 'EXPLAIN': - title = 'Explain query'; - queryMsg = paragraph.queryArgs.query; + scope.title = 'Explain query'; + scope.content = [paragraph.queryArgs.query]; break; default: - title = 'SCAN query'; - queryMsg = 'SCAN query for cache <b>' + paragraph.queryArgs.cacheName + '</b>'; + scope.title = 'SCAN query'; + scope.content = ['SCAN query for cache <b>' + paragraph.queryArgs.cacheName + '</b>']; } // Show a basic modal from a controller - $modal({title: title, content: [queryMsg], template: '/templates/message.html', show: true}); + $modal({scope: scope, template: '/templates/message.html', show: true}); } } });
