You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by ch...@apache.org on 2018/02/08 07:16:36 UTC
kylin git commit: KYLIN-3241
Repository: kylin
Updated Branches:
refs/heads/2.3.x dfd5a4eae -> 029ba4ecb
KYLIN-3241
Signed-off-by: chenzhx <ch...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/029ba4ec
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/029ba4ec
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/029ba4ec
Branch: refs/heads/2.3.x
Commit: 029ba4ecb29497fecc5f08d7c97bfcf04546ea89
Parents: dfd5a4e
Author: xingpeng1 <xi...@zte.com.cn>
Authored: Mon Feb 5 19:04:48 2018 +0800
Committer: chenzhx <ch...@apache.org>
Committed: Thu Feb 8 15:15:30 2018 +0800
----------------------------------------------------------------------
webapp/app/js/model/cubeDescModel.js | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/029ba4ec/webapp/app/js/model/cubeDescModel.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/model/cubeDescModel.js b/webapp/app/js/model/cubeDescModel.js
index 9bf969f..6cd0fe2 100644
--- a/webapp/app/js/model/cubeDescModel.js
+++ b/webapp/app/js/model/cubeDescModel.js
@@ -20,6 +20,18 @@ KylinApp.service('CubeDescModel', function (kylinConfig) {
this.cubeMetaFrame = {};
this.createNew = function (defaultPara) {
+ var engineType;
+ var storageType;
+ if (kylinConfig.isInitialized()) {
+ engineType = kylinConfig.getCubeEng();
+ storageType = kylinConfig.getStorageEng();
+ } else {
+ kylinConfig.init().$promise.then(function (data) {
+ kylinConfig.initWebConfigInfo();
+ engineType = kylinConfig.getCubeEng();
+ storageType = kylinConfig.getStorageEng();
+ });
+ }
var cubeMeta = {
"name": "",
"model_name": "",
@@ -56,8 +68,8 @@ KylinApp.service('CubeDescModel', function (kylinConfig) {
"retention_range": "0",
"status_need_notify":['ERROR', 'DISCARDED', 'SUCCEED'],
"auto_merge_time_ranges": [604800000, 2419200000],
- "engine_type": kylinConfig.getCubeEng(),
- "storage_type":kylinConfig.getStorageEng(),
+ "engine_type": engineType,
+ "storage_type": storageType,
"override_kylin_properties":{}
};