Skip to content

Commit

Permalink
KYLIN-1925 prevent cross project clone
Browse files Browse the repository at this point in the history
  • Loading branch information
janzhongi committed Jul 28, 2016
1 parent 260b62e commit fcf4ed0
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 12 deletions.
5 changes: 5 additions & 0 deletions webapp/app/js/controllers/cubes.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
26 changes: 14 additions & 12 deletions webapp/app/partials/cubes/cube_clone.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,20 @@ <h4 tooltip="submit">CUBE CLONE</h4>
<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>
Expand Down

0 comments on commit fcf4ed0

Please sign in to comment.