External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-13 11:00:03 -03:30
Code Issues Packages Projects Releases Wiki Activity

make cancel normal after copy

Browse Source
This commit is contained in:
John Mitchell 2016-06-15 16:08:45 -04:00
parent b9c2567cf7
commit 7b5bbe52f3
3 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/client/src/job-templates/copy/job-templates-copy.controller.js
View File

@ -19,7 +19,7 @@
jobTemplateCopyService.set(res)
.success(function(res){
Wait('stop');
$state.go('jobTemplates.edit', {id: res.id, copied: true}, {reload: true});
$state.go('jobTemplates.edit', {id: res.id}, {reload: true});
});
})
.error(function(res, status){

16
awx/ui/client/src/job-templates/edit/job-templates-edit.controller.js
View File

@ -652,21 +652,7 @@ export default
$scope.formCancel = function () {
// the form was just copied in the previous state, it's safe to destroy on cancel
if ($state.params.copied){
var defaultUrl = GetBasePath('job_templates') + $state.params.id;
Rest.setUrl(defaultUrl);
Rest.destroy()
.success(function(){
$state.go('jobTemplates', null, {reload: true, notify:true});
})
.error(function(res, status){
ProcessErrors($rootScope, res, status, null, {hdr: 'Error!',
msg: 'Call to '+ defaultUrl + ' failed. Return status: '+ status});
});
}
else {
$state.go('jobTemplates');
}
$state.go('jobTemplates');
};
// Related set: Add button

1
awx/ui/client/src/job-templates/edit/job-templates-edit.route.js
View File

@ -15,7 +15,6 @@ export default {
activityStreamId: 'id'
},
params: {
copied: null
},
ncyBreadcrumb: {
parent: 'jobTemplates',