Merge pull request #2139 from anoek/2107

Fixed job template verbosity select2 syncing
This commit is contained in:
Akita Noek
2016-06-02 22:01:30 -04:00
2 changed files with 11 additions and 6 deletions

View File

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

View File

@@ -83,6 +83,13 @@ export default
}); });
} }
function sync_verbosity_select2() {
CreateSelect2({
element:'#job_templates_verbosity',
multiple: false
});
}
getPlaybooks = function (project) { getPlaybooks = function (project) {
var url; var url;
if ($scope.playbook) { 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 // Turn off 'Wait' after both cloud credential and playbook list come back
@@ -406,6 +415,7 @@ export default
variable: 'verbosity_options', variable: 'verbosity_options',
callback: 'choicesReady' callback: 'choicesReady'
}); });
sync_verbosity_select2();
// setup job type options lookup // setup job type options lookup
GetChoices({ GetChoices({
@@ -460,11 +470,6 @@ export default
Wait("stop"); Wait("stop");
}); });
}); });
CreateSelect2({
element:'#job_templates_verbosity',
multiple: false
});
}) })
.error(function (data, status) { .error(function (data, status) {
ProcessErrors($scope, data, status, form, { ProcessErrors($scope, data, status, form, {