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

Host Config Key field and checkbox are on the Job detail page as well. Jobs controller now pulls the values from the related job template -API does not expose the values on /jobs/N.

Browse Source
This commit is contained in:
chouseknecht
2013-06-21 18:03:27 -04:00
parent 8ef9c9ed0b
commit baad4bd7e6
2 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
ansibleworks/ui/static/js/controllers/Jobs.js
View File

@@ -191,18 +191,29 @@ function JobsEdit ($scope, $rootScope, $compile, $location, $log, $routeParams,
// Set the playbook lookup // Set the playbook lookup
getPlaybooks(scope.project); getPlaybooks(scope.project);
// display/hide host callback fields
var dft = (scope['host_config_key']) ? 'true' : 'false';
md5Setup({
scope: scope,
master: master,
check_field: 'allow_callbacks',
default_val: dft
});
$('#forks-slider').slider("option", "value", scope.forks); $('#forks-slider').slider("option", "value", scope.forks);
$('#forks-slider').slider("disable"); $('#forks-slider').slider("disable");
$('input[type="checkbox"]').attr('disabled','disabled');
// Get job template and display/hide host callback fields
Rest.setUrl(scope.template_url);
Rest.get()
.success( function(data, status, headers, config) {
var dft = (data['host_config_key']) ? 'true' : 'false';
scope['host_config_key'] = data['host_config_key'];
md5Setup({
scope: scope,
master: master,
check_field: 'allow_callbacks',
default_val: dft
});
$('input[type="checkbox"]').attr('disabled','disabled');
$('#host_config_key-gen-btn').attr('disabled','disabled');
})
.error( function(data, status, headers, config) {
ProcessErrors(scope, data, status, form,
{ hdr: 'Error!', msg: 'Failed to retrieve job: ' + $routeParams.id + '. GET status: ' + status });
});
}); });
// Our job type options // Our job type options
@@ -293,11 +304,12 @@ function JobsEdit ($scope, $rootScope, $compile, $location, $log, $routeParams,
// Initialize related search functions. Doing it here to make sure relatedSets object is populated. // Initialize related search functions. Doing it here to make sure relatedSets object is populated.
RelatedSearchInit({ scope: scope, form: form, relatedSets: relatedSets }); RelatedSearchInit({ scope: scope, form: form, relatedSets: relatedSets });
RelatedPaginateInit({ scope: scope, relatedSets: relatedSets }); RelatedPaginateInit({ scope: scope, relatedSets: relatedSets });
scope.template_url = data.related.job_template;
scope.$emit('jobLoaded'); scope.$emit('jobLoaded');
}) })
.error( function(data, status, headers, config) { .error( function(data, status, headers, config) {
ProcessErrors(scope, data, status, form, ProcessErrors(scope, data, status, form,
{ hdr: 'Error!', msg: 'Failed to retrieve job template: ' + $routeParams.id + '. GET status: ' + status }); { hdr: 'Error!', msg: 'Failed to retrieve job: ' + $routeParams.id + '. GET status: ' + status });
}); });
// Save changes to the parent // Save changes to the parent

2
ansibleworks/ui/static/lib/ansible/form-generator.js
View File

@@ -181,7 +181,7 @@ angular.module('FormGenerator', ['GeneratorHelpers'])
html += " \n<button class=\"btn\" ng-click=\"genMD5('" + fld + "')\" " + html += " \n<button class=\"btn\" ng-click=\"genMD5('" + fld + "')\" " +
"aw-tool-tip=\"Generate " + field.label + "\" data-placement=\"top\" id=\"" + fld + "-gen-btn\"><i class=\"icon-repeat\"></i></button>\n"; "aw-tool-tip=\"Generate " + field.label + "\" data-placement=\"top\" id=\"" + fld + "-gen-btn\"><i class=\"icon-repeat\"></i></button>\n";
html += " \n<button style=\"margin-left: 10px;\" class=\"btn\" ng-click=\"selectAll('" + fld + "')\" " + html += " \n<button style=\"margin-left: 10px;\" class=\"btn\" ng-click=\"selectAll('" + fld + "')\" " +
"aw-tool-tip=\"Select " + field.label + " for copy\" data-placement=\"top\" id=\"" + fld + "-gen-btn\"><i class=\"icon-copy\"></i></button>\n"; "aw-tool-tip=\"Select " + field.label + " for copy\" data-placement=\"top\" id=\"" + fld + "-copy-btn\"><i class=\"icon-copy\"></i></button>\n";
html += "</div>\n"; html += "</div>\n";
} }
if (field.ask) { if (field.ask) {