You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by nj...@apache.org on 2016/04/18 08:35:01 UTC

[19/50] kylin git commit: minor, UI fix add cube/model page refresh issue

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/f18f7b02
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/f18f7b02
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/f18f7b02

Branch: refs/heads/1.4-rc
Commit: f18f7b025cc10c7a2d0b160fbdcb344991d7bde2
Parents: 2aeca11
Author: janzhongi <ji...@ebay.com>
Authored: Tue Feb 23 15:43:46 2016 +0800
Committer: janzhongi <ji...@ebay.com>
Committed: Tue Feb 23 15:43:46 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/f18f7b02/webapp/app/js/controllers/cubeEdit.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/cubeEdit.js b/webapp/app/js/controllers/cubeEdit.js
index 5901c4f..2e1c9c5 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/f18f7b02/webapp/app/js/controllers/modelEdit.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/modelEdit.js b/webapp/app/js/controllers/modelEdit.js
index 34c0bd5..aafa122 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");
     }