kylin-commits mailing list archives

Repository: kylin
Updated Branches:
  refs/heads/2.x-staging ce5bcd2b0 -> ed6d971e9


minor, UI fix add cube/model page refresh issue


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/ed6d971e
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/ed6d971e
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/ed6d971e

Branch: refs/heads/2.x-staging
Commit: ed6d971e9ad394543be2b01cfcaa6750106b1998
Parents: ce5bcd2
Author: janzhongi <jiazhong@ebay.com>
Authored: Tue Feb 23 15:41:36 2016 +0800
Committer: janzhongi <jiazhong@ebay.com>
Committed: Tue Feb 23 15:41:36 2016 +0800

----------------------------------------------------------------------
 webapp/app/js/controllers/cubeEdit.js  | 2 +-
 webapp/app/js/controllers/modelEdit.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kylin/blob/ed6d971e/webapp/app/js/controllers/cubeEdit.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/cubeEdit.js b/webapp/app/js/controllers/cubeEdit.js
index 2968a9b..578f6c8 100755
--- a/webapp/app/js/controllers/cubeEdit.js
+++ b/webapp/app/js/controllers/cubeEdit.js
@@ -30,7 +30,7 @@ KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams,
$locatio
   var absUrl = $location.absUrl();
   $scope.cubeMode = absUrl.indexOf("/cubes/add") != -1 ? 'addNewCube' : absUrl.indexOf("/cubes/edit")
!= -1 ? 'editExistCube' : 'default';
 
-  if ($scope.cubeMode == "addNewCube" && !ProjectModel.getSelectedProject()) {
+  if ($scope.cubeMode == "addNewCube" && ProjectModel.selectedProject==null) {
     SweetAlert.swal('Oops...', 'Please select your project first.', 'warning');
     $location.path("/models");
     return;

http://git-wip-us.apache.org/repos/asf/kylin/blob/ed6d971e/webapp/app/js/controllers/modelEdit.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/modelEdit.js b/webapp/app/js/controllers/modelEdit.js
index d0785dc..2de251e 100644
--- a/webapp/app/js/controllers/modelEdit.js
+++ b/webapp/app/js/controllers/modelEdit.js
@@ -24,7 +24,7 @@ KylinApp.controller('ModelEditCtrl', function ($scope, $q, $routeParams,
$locati
     var absUrl = $location.absUrl();
     $scope.modelMode = absUrl.indexOf("/models/add")!=-1?'addNewModel':absUrl.indexOf("/models/edit")!=-1?'editExistModel':'default';
 
-    if($scope.modelMode=="addNewModel"&&!ProjectModel.getSelectedProject()){
+    if($scope.modelMode=="addNewModel"&&ProjectModel.selectedProject==null){
         SweetAlert.swal('Oops...', 'Please select your project first.', 'warning');
         $location.path("/models");
     }