KYLIN-2287 rm deprecated code & add streaming info when show storage
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/488283d3 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/488283d3 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/488283d3 Branch: refs/heads/master Commit: 488283d3de1a385a4a6ed03ebd2e412cb9f2f7d7 Parents: 4496928 Author: zhongjian <jiat...@163.com> Authored: Fri Dec 23 21:35:45 2016 +0800 Committer: zhongjian <jiat...@163.com> Committed: Fri Dec 23 21:35:45 2016 +0800 ---------------------------------------------------------------------- webapp/app/js/controllers/cube.js | 6 ++++++ webapp/app/js/controllers/cubeEdit.js | 3 --- webapp/app/js/controllers/sourceMeta.js | 3 --- webapp/app/partials/cubes/cube_detail.html | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/488283d3/webapp/app/js/controllers/cube.js ---------------------------------------------------------------------- diff --git a/webapp/app/js/controllers/cube.js b/webapp/app/js/controllers/cube.js index 57b53e7..9e675d2 100755 --- a/webapp/app/js/controllers/cube.js +++ b/webapp/app/js/controllers/cube.js @@ -88,6 +88,12 @@ KylinApp.controller('CubeCtrl', function ($scope, AccessService, MessageService, CubeService.getHbaseInfo({cubeId: cube.name, propValue: null, action: null}, function (hbase) { cube.hbase = hbase; + TableService.get({tableName:cube.model.fact_table},function(table) { + if (table && table.source_type == 1) { + cube.streaming = true; + } + }) + // Calculate cube total size based on each htable. var totalSize = 0; hbase.forEach(function(t) { http://git-wip-us.apache.org/repos/asf/kylin/blob/488283d3/webapp/app/js/controllers/cubeEdit.js ---------------------------------------------------------------------- diff --git a/webapp/app/js/controllers/cubeEdit.js b/webapp/app/js/controllers/cubeEdit.js index 90cdbc0..edbb421 100755 --- a/webapp/app/js/controllers/cubeEdit.js +++ b/webapp/app/js/controllers/cubeEdit.js @@ -311,9 +311,6 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio "mode": 'edit' }; - $scope.cubeState={ - "isStreaming": false - } //fetch cube info and model info in edit model // ~ init http://git-wip-us.apache.org/repos/asf/kylin/blob/488283d3/webapp/app/js/controllers/sourceMeta.js ---------------------------------------------------------------------- diff --git a/webapp/app/js/controllers/sourceMeta.js b/webapp/app/js/controllers/sourceMeta.js index dc3c421..bbb9915 100755 --- a/webapp/app/js/controllers/sourceMeta.js +++ b/webapp/app/js/controllers/sourceMeta.js @@ -552,9 +552,6 @@ KylinApp var StreamingSourceCtrl = function ($scope, $location,$interpolate,$templateCache, $modalInstance, tableNames, MessageService, projectName, scope, tableConfig,cubeConfig,StreamingModel,StreamingService) { - $scope.cubeState={ - "isStreaming": false - } $scope.state={ 'mode':'edit' } http://git-wip-us.apache.org/repos/asf/kylin/blob/488283d3/webapp/app/partials/cubes/cube_detail.html ---------------------------------------------------------------------- diff --git a/webapp/app/partials/cubes/cube_detail.html b/webapp/app/partials/cubes/cube_detail.html index 1896b42..4319b94 100755 --- a/webapp/app/partials/cubes/cube_detail.html +++ b/webapp/app/partials/cubes/cube_detail.html @@ -44,7 +44,7 @@ <div class="cube-detail" ng-if="!cube.visiblePage || cube.visiblePage=='metadata'"> <div ng-include="'partials/cubes/cube_schema.html'" ng-controller="CubeSchemaCtrl" - ng-init="state={mode:'view', cubeName:cube.name};cubeState={isStreaming:(!!cube.streaming)?true:false}"></div> + ng-init="state={mode:'view', cubeName:cube.name};"></div> </div> <div ng-show="cube.visiblePage=='sql'" class="cube-detail">
