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

Merge pull request #2139 from anoek/2107

Browse Source 
Fixed job template verbosity select2 syncing
This commit is contained in:
Akita Noek 2016-06-02 22:01:30 -04:00
commit fe56b11243
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/client/src/helpers/JobTemplates.js
View File

@ -178,7 +178,7 @@ angular.module('JobTemplatesHelper', ['Utilities'])
if (scope.project === "" && scope.playbook === "") {
scope.toggleScanInfo();
scope.resetProjectToDefault();
}
RelatedSearchInit({

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

@ -83,6 +83,13 @@ export default
});
}
function sync_verbosity_select2() {
CreateSelect2({
element:'#job_templates_verbosity',
multiple: false
});
}
getPlaybooks = function (project) {
var url;
if ($scope.playbook) {
@ -243,6 +250,8 @@ export default
}
});
// watch for changes to 'verbosity', ensure we keep our select2 in sync when it changes.
$scope.$watch('verbosity', sync_verbosity_select2);
// Turn off 'Wait' after both cloud credential and playbook list come back
@ -406,6 +415,7 @@ export default
variable: 'verbosity_options',
callback: 'choicesReady'
});
sync_verbosity_select2();
// setup job type options lookup
GetChoices({
@ -460,11 +470,6 @@ export default
Wait("stop");
});
});
CreateSelect2({
element:'#job_templates_verbosity',
multiple: false
});
})
.error(function (data, status) {
ProcessErrors($scope, data, status, form, {