Repository: kylin Updated Branches: refs/heads/master 260b62e18 -> fcf4ed04a
KYLIN-1925 prevent cross project clone Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/fcf4ed04 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/fcf4ed04 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/fcf4ed04 Branch: refs/heads/master Commit: fcf4ed04aa26b0ce48cd2987fb0b62b82dbe024a Parents: 260b62e Author: Jason <jiat...@163.com> Authored: Thu Jul 28 12:48:08 2016 +0800 Committer: Jason <jiat...@163.com> Committed: Thu Jul 28 12:48:08 2016 +0800 ---------------------------------------------------------------------- webapp/app/js/controllers/cubes.js | 5 +++++ webapp/app/partials/cubes/cube_clone.html | 26 ++++++++++++++------------ 2 files changed, 19 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/fcf4ed04/webapp/app/js/controllers/cubes.js ---------------------------------------------------------------------- diff --git a/webapp/app/js/controllers/cubes.js b/webapp/app/js/controllers/cubes.js index 85c7825..19de285 100644 --- a/webapp/app/js/controllers/cubes.js +++ b/webapp/app/js/controllers/cubes.js @@ -438,6 +438,11 @@ KylinApp.controller('CubesCtrl', function ($scope, $q, $routeParams, $location, }; $scope.cloneCube = function(cube){ + if(!$scope.projectModel.selectedProject){ + SweetAlert.swal('Oops...', "Please choose project before clone.", 'info'); + return; + } + $scope.loadDetail(cube).then(function () { $modal.open({ templateUrl: 'cubeClone.html', http://git-wip-us.apache.org/repos/asf/kylin/blob/fcf4ed04/webapp/app/partials/cubes/cube_clone.html ---------------------------------------------------------------------- diff --git a/webapp/app/partials/cubes/cube_clone.html b/webapp/app/partials/cubes/cube_clone.html index edbc137..f54bcd3 100644 --- a/webapp/app/partials/cubes/cube_clone.html +++ b/webapp/app/partials/cubes/cube_clone.html @@ -26,18 +26,20 @@ <div class="col-md-2"></div> <div class="col-md-8"> <div class="row"> - <div class="form-group"> - <b>Target Project is:</b> - <br/> - <select ng-required="projectModel.projects.length" chosen ng-model="targetObj.targetProject" - ng-init="newAccess.permission=permissions.READ.value;" - ng-options="project.name as project.name for project in projectModel.projects " - style="width: 100% !important;" - data-placeholder="select a project" - class="chosen-select"> - <option value=""></option> - </select> - </div> + <p class="text-info"> Cross project clone is not allowed now, cube will be cloned into current project.</p> + <!--<div class="form-group">--> + <!--<b>Target Project is:</b>--> + <!--<br/>--> + <!--<select ng-required="projectModel.projects.length" chosen ng-model="targetObj.targetProject"--> + <!--ng-init="newAccess.permission=permissions.READ.value;"--> + <!--ng-options="project.name as project.name for project in projectModel.projects "--> + <!--ng-disabled="true"--> + <!--style="width: 100% !important;"--> + <!--data-placeholder="select a project"--> + <!--class="chosen-select">--> + <!--<option value=""></option>--> + <!--</select>--> + <!--</div>--> </div> </div> <div class="col-md-2"></div>
