KYLIN 1997 add pivot feature back in query result page Signed-off-by: Jason <jiat...@163.com>
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/be7751bc Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/be7751bc Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/be7751bc Branch: refs/heads/KYLIN-1726 Commit: be7751bc021063f89e5955e5f1c50d66bedc5b91 Parents: ded3b58 Author: chenzhx <346839...@qq.com> Authored: Thu Sep 8 16:21:32 2016 +0800 Committer: Jason <jiat...@163.com> Committed: Thu Sep 8 17:51:28 2016 +0800 ---------------------------------------------------------------------- webapp/app/js/app.js | 2 +- webapp/app/partials/query/query_detail.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/be7751bc/webapp/app/js/app.js ---------------------------------------------------------------------- diff --git a/webapp/app/js/app.js b/webapp/app/js/app.js index 3708037..629617e 100644 --- a/webapp/app/js/app.js +++ b/webapp/app/js/app.js @@ -17,4 +17,4 @@ */ //Kylin Application Module -KylinApp = angular.module('kylin', ['ngRoute', 'ngResource', 'ngGrid', 'ui.grid', 'ui.grid.resizeColumns', 'ui.bootstrap', 'ui.ace', 'base64', 'angularLocalStorage', 'localytics.directives', 'treeControl', 'nvd3ChartDirectives', 'ngLoadingRequest', 'oitozero.ngSweetAlert', 'ngCookies', 'angular-underscore', 'ngAnimate', 'ui.sortable', 'angularBootstrapNavTree', 'toggle-switch', 'ngSanitize', 'ui.select', 'ui.bootstrap.datetimepicker']); +KylinApp = angular.module('kylin', ['ngRoute', 'ngResource', 'ngGrid', 'ui.grid', 'ui.grid.resizeColumns', 'ui.grid.grouping', 'ui.bootstrap', 'ui.ace', 'base64', 'angularLocalStorage', 'localytics.directives', 'treeControl', 'nvd3ChartDirectives', 'ngLoadingRequest', 'oitozero.ngSweetAlert', 'ngCookies', 'angular-underscore', 'ngAnimate', 'ui.sortable', 'angularBootstrapNavTree', 'toggle-switch', 'ngSanitize', 'ui.select', 'ui.bootstrap.datetimepicker']); http://git-wip-us.apache.org/repos/asf/kylin/blob/be7751bc/webapp/app/partials/query/query_detail.html ---------------------------------------------------------------------- diff --git a/webapp/app/partials/query/query_detail.html b/webapp/app/partials/query/query_detail.html index 72da6b7..8e1286c 100644 --- a/webapp/app/partials/query/query_detail.html +++ b/webapp/app/partials/query/query_detail.html @@ -96,7 +96,7 @@ <div ng-if="!curQuery.graph.show"> <div class="query-results"> <div ng-if="curQuery.status=='success'"> - <div class="gridStyle" ui-grid="curQuery.result.gridOptions" ui-grid-resize-columns + <div class="gridStyle" ui-grid="curQuery.result.gridOptions" ui-grid-resize-columns ui-grid-grouping ng-if="curQuery.result.results.length > 0" id="data_grid" style="{{ui.fullScreen?'height: 600px;width:auto':'height: 300px'}}"></div> <div ng-if="!curQuery.result.results || curQuery.result.results.length == 0"
