External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-07 19:51:08 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #528 from mabashian/5129-jt-spinner-v2

Browse Source 
Moved wait stop calls on jt form so that they fire right before reloading state
This commit is contained in:
Michael Abashian
2017-10-16 16:20:02 -04:00
committed by GitHub
parent fceca3bcae 2cab6982c1
commit 3d12e040ed
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
awx/ui/client/src/templates/job_templates/add-job-template/job-template-add.controller.js
View File

@@ -341,7 +341,6 @@
Rest.post(data) Rest.post(data)
.then(({data}) => { .then(({data}) => {
Wait('stop');
if (data.related && data.related.callback) { if (data.related && data.related.callback) {
Alert('Callback URL', Alert('Callback URL',
`Host callbacks are enabled for this template. The callback URL is: `Host callbacks are enabled for this template. The callback URL is:

3
awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js
View File

@@ -496,7 +496,7 @@ export default
$scope.removeTemplateSaveSuccess(); $scope.removeTemplateSaveSuccess();
} }
$scope.removeTemplateSaveSuccess = $scope.$on('templateSaveSuccess', function(e, data) { $scope.removeTemplateSaveSuccess = $scope.$on('templateSaveSuccess', function(e, data) {
Wait('stop');
if (data.related && if (data.related &&
data.related.callback) { data.related.callback) {
Alert('Callback URL', Alert('Callback URL',
@@ -606,6 +606,7 @@ export default
} }
$q.all(defers) $q.all(defers)
.then(function() { .then(function() {
Wait('stop');
saveCompleted(); saveCompleted();
}); });
}); });