You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by sh...@apache.org on 2015/10/26 10:07:48 UTC
[02/45] incubator-kylin git commit: KYLIN-1035,
Validate [Project] before create Cube on UI
KYLIN-1035, Validate [Project] before create Cube on UI
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/df15cad1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/df15cad1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/df15cad1
Branch: refs/heads/master
Commit: df15cad19918086114791546b44fe37a9868ff79
Parents: 607aeb4
Author: jiazhong <ji...@ebay.com>
Authored: Mon Sep 21 11:16:07 2015 +0800
Committer: jiazhong <ji...@ebay.com>
Committed: Mon Sep 21 11:16:46 2015 +0800
----------------------------------------------------------------------
webapp/app/js/controllers/cubeEdit.js | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/df15cad1/webapp/app/js/controllers/cubeEdit.js
----------------------------------------------------------------------
diff --git a/webapp/app/js/controllers/cubeEdit.js b/webapp/app/js/controllers/cubeEdit.js
index 16a9203..2dade99 100755
--- a/webapp/app/js/controllers/cubeEdit.js
+++ b/webapp/app/js/controllers/cubeEdit.js
@@ -19,12 +19,18 @@
'use strict';
-KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $location, $templateCache, $interpolate, MessageService, TableService, CubeDescService, CubeService, loadingRequest, SweetAlert, $log, cubeConfig, CubeDescModel, ModelService, MetaModel, TableModel) {
+KylinApp.controller('CubeEditCtrl', function ($scope, $q, $routeParams, $location, $templateCache, $interpolate, MessageService, TableService, CubeDescService, CubeService, loadingRequest, SweetAlert, $log, cubeConfig, CubeDescModel, ModelService, MetaModel, TableModel,ProjectModel) {
$scope.cubeConfig = cubeConfig;
//add or edit ?
var absUrl = $location.absUrl();
$scope.cubeMode = absUrl.indexOf("/cubes/add") != -1 ? 'addNewCube' : absUrl.indexOf("/cubes/edit") != -1 ? 'editExistCube' : 'default';
+ //validate project before create
+ if($scope.cubeMode=="addNewCube"&&!ProjectModel.getSelectedProject()){
+ SweetAlert.swal('Oops...', 'Please select your project first.', 'warning');
+ $location.path("/cubes");
+ return;
+ }
$scope.getColumnsByTable = function (tableName) {
var temp = [];