[kylin] branch master updated: KYLIN-3916 Fix cube build action issue after streaming migrate

[boblu]

This is an automated email from the ASF dual-hosted git repository.

boblu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kylin.git


The following commit(s) were added to refs/heads/master by this push:
     new f0daeaf  KYLIN-3916 Fix cube build action issue after streaming migrate
f0daeaf is described below

commit f0daeaf9071dd8ef51d0d9136ef0af90b4cdec2b
Author: liapan <lia...@ebay.com>
AuthorDate: Wed Mar 27 17:57:17 2019 +0800

    KYLIN-3916 Fix cube build action issue after streaming migrate
---
 webapp/app/js/controllers/cubes.js | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/webapp/app/js/controllers/cubes.js 
b/webapp/app/js/controllers/cubes.js
index a4ad922..61f2f2b 100644
--- a/webapp/app/js/controllers/cubes.js
+++ b/webapp/app/js/controllers/cubes.js
@@ -108,13 +108,13 @@ KylinApp.controller('CubesCtrl', function ($scope, $q, 
$routeParams, $location,
     $scope.loadDetail = function (cube) {
       var defer = $q.defer();
       if (cube.detail) {
-        defer.resolve(cube.detail);
+        defer.resolve(cube);
       } else {
         CubeDescService.query({cube_name: cube.name}, {}, function (detail) {
           if (detail.length > 0 && detail[0].hasOwnProperty("name")) {
             cube.detail = detail[0];
             cube.model = modelsManager.getModel(cube.detail.model_name);
-              defer.resolve(cube.detail);
+              defer.resolve(cube);
 
           } else {
             SweetAlert.swal('Oops...', "No cube detail info loaded.", 'error');
@@ -387,10 +387,10 @@ KylinApp.controller('CubesCtrl', function ($scope, $q, 
$routeParams, $location,
     $scope.startJobSubmit = function (cube) {
 
       $scope.metaModel={
-        model:cube.detail.model
+        model:cube.model
       };
 
-      if(cube.detail.streaming){
+      if(cube.streaming){
         SweetAlert.swal({
           title: '',
           text: "Are you sure to start the build?",
@@ -404,7 +404,7 @@ KylinApp.controller('CubesCtrl', function ($scope, $q, 
$routeParams, $location,
             loadingRequest.show();
             CubeService.rebuildStreamingCube(
               {
-                cubeId: cube.detail.name
+                cubeId: cube.name
               },
               {
                 sourceOffsetStart:0,
@@ -439,7 +439,7 @@ KylinApp.controller('CubesCtrl', function ($scope, $q, 
$routeParams, $location,
             controller: jobSubmitCtrl,
             resolve: {
               cube: function () {
-                return cube.detail;
+                return cube;
               },
               metaModel:function(){
                 return $scope.metaModel;
@@ -470,7 +470,7 @@ KylinApp.controller('CubesCtrl', function ($scope, $q, 
$routeParams, $location,
               loadingRequest.show();
               CubeService.rebuildCube(
                 {
-                  cubeId: cube.detail.name
+                  cubeId: cube.name
                 },
                 {
                   buildType: 'BUILD',
@@ -502,14 +502,14 @@ KylinApp.controller('CubesCtrl', function ($scope, $q, 
$routeParams, $location,
     $scope.startRefresh = function (cube) {
 
       $scope.metaModel={
-        model:cube.detail.model
+        model:cube.model
       };
       $modal.open({
         templateUrl: 'jobRefresh.html',
         controller: jobSubmitCtrl,
         resolve: {
           cube: function () {
-            return cube.detail;
+            return cube;
           },
           metaModel:function(){
             return $scope.metaModel;
@@ -536,7 +536,7 @@ KylinApp.controller('CubesCtrl', function ($scope, $q, 
$routeParams, $location,
         windowClass:"clone-cube-window",
         resolve: {
           cube: function () {
-            return cube.detail;
+            return cube;
           }
         }
       });
@@ -547,14 +547,14 @@ KylinApp.controller('CubesCtrl', function ($scope, $q, 
$routeParams, $location,
     $scope.startMerge = function (cube) {
 
       $scope.metaModel={
-        model:cube.detail.model
+        model:cube.model
       };
       $modal.open({
         templateUrl: 'jobMerge.html',
         controller: jobSubmitCtrl,
         resolve: {
           cube: function () {
-            return cube.detail;
+            return cube;
           },
           metaModel:function(){
             return $scope.metaModel;
@@ -572,14 +572,14 @@ KylinApp.controller('CubesCtrl', function ($scope, $q, 
$routeParams, $location,
 
      $scope.startDeleteSegment = function (cube) {
        $scope.metaModel={
-         model:modelsManager.getModelByCube(cube.detail.name)
+         model:modelsManager.getModelByCube(cube.name)
        };
        $modal.open({
          templateUrl: 'deleteSegment.html',
          controller: deleteSegmentCtrl,
          resolve: {
            cube: function () {
-             return cube.detail;
+             return cube;
            },
            scope: function() {
              return $scope;
@@ -590,14 +590,14 @@ KylinApp.controller('CubesCtrl', function ($scope, $q, 
$routeParams, $location,
 
     $scope.startLookupRefresh = function(cube) {
       $scope.metaModel={
-        model:cube.detail.model
+        model:cube.model
       };
       $modal.open({
         templateUrl: 'lookupRefresh.html',
         controller: lookupRefreshCtrl,
         resolve: {
           cube: function () {
-            return cube.detail;
+            return cube;
           },
           scope:function(){
             return $scope;