From ec9f9772ebb5c0133ef8bb86e2f150afdc829a2a Mon Sep 17 00:00:00 2001
From: "peng.jianhua" <peng.jianhua@zte.com.cn>
Date: Thu, 18 Jan 2018 19:50:37 +0800
Subject: [PATCH 1/1] KYLIN-3130 If we add new cube then refresh the page,the
 page is blank

---
 webapp/app/js/controllers/cubeEdit.js | 20 +++++++++++++-------
 webapp/app/js/model/cubeDescModel.js  |  2 --
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/webapp/app/js/controllers/cubeEdit.js b/webapp/app/js/controllers/cubeEdit.js
index 3cf248fb5..51c1ad6f8 100755
--- a/webapp/app/js/controllers/cubeEdit.js
+++ b/webapp/app/js/controllers/cubeEdit.js
@@ -19,7 +19,7 @@
 'use strict';
 
 
-KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $location, $templateCache, $interpolate, MessageService, TableService, CubeDescService, CubeService, loadingRequest, SweetAlert, $log, cubeConfig, CubeDescModel, MetaModel, TableModel, ModelDescService, modelsManager, cubesManager, ProjectModel, StreamingModel, StreamingService,VdmUtil) {
+KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $location, $templateCache, $interpolate, MessageService, TableService, CubeDescService, CubeService, loadingRequest, SweetAlert, $log, cubeConfig, CubeDescModel, MetaModel, TableModel, ModelDescService, modelsManager, cubesManager, ProjectModel, StreamingModel, StreamingService,VdmUtil,kylinConfig) {
   $scope.cubeConfig = cubeConfig;
   $scope.metaModel = {};
   $scope.modelsManager = modelsManager;
@@ -265,13 +265,19 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $locatio
 
   } else {
 //        $scope.cubeMetaFrame = CubeDescModel.createNew();
-    $scope.cubeMetaFrame = CubeDescModel.createNew();
-    $scope.metaModel = {
-      model: modelsManager.getModel($scope.cubeMetaFrame.model_name)
-    }
-    //$scope.cubeMetaFrame.model_name = modelName;
-    $scope.state.cubeSchema = angular.toJson($scope.cubeMetaFrame, true);
+    kylinConfig.init().$promise.then(function (data) {
+        $log.debug(data);
+
+        $scope.cubeMetaFrame = CubeDescModel.createNew();
+        $scope.cubeMetaFrame.engine_type=kylinConfig.getCubeEng();
+        $scope.cubeMetaFrame.storage_type=kylinConfig.getStorageEng();
 
+        $scope.metaModel = {
+            model: modelsManager.getModel($scope.cubeMetaFrame.model_name)
+        }
+    //$scope.cubeMetaFrame.model_name = modelName;
+        $scope.state.cubeSchema = angular.toJson($scope.cubeMetaFrame, true);
+    })
   }
 
 
diff --git a/webapp/app/js/model/cubeDescModel.js b/webapp/app/js/model/cubeDescModel.js
index 9bf969f4a..9a8b97825 100644
--- a/webapp/app/js/model/cubeDescModel.js
+++ b/webapp/app/js/model/cubeDescModel.js
@@ -56,8 +56,6 @@ 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(),
       "override_kylin_properties":{}
     };
 
-- 
2.11.0.windows.1