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

Merge pull request #2599 from mabashian/stack-jt-checkboxes

Browse Source 
Moved job template checkboxes into a group
This commit is contained in:
Michael Abashian
2016-06-24 11:19:44 -04:00
committed by GitHub
parent 2518d78f31 8f0d890fb9
commit ac1f3e142f
4 changed files with 51 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
awx/ui/client/src/forms/JobTemplates.js
View File

@@ -225,7 +225,11 @@ export default
text: 'Prompt on launch' text: 'Prompt on launch'
} }
}, },
become_enabled: { checkbox_group: {
label: 'Options',
type: 'checkbox_group',
fields: [{
name: 'become_enabled',
label: 'Enable Privilege Escalation', label: 'Enable Privilege Escalation',
type: 'checkbox', type: 'checkbox',
addRequired: false, addRequired: false,
@@ -234,9 +238,10 @@ export default
awPopOver: "<p>If enabled, run this playbook as an administrator. This is the equivalent of passing the <code>--become</code> option to the <code>ansible-playbook</code> command. </p>", awPopOver: "<p>If enabled, run this playbook as an administrator. This is the equivalent of passing the <code>--become</code> option to the <code>ansible-playbook</code> command. </p>",
dataPlacement: 'right', dataPlacement: 'right',
dataTitle: 'Become Privilege Escalation', dataTitle: 'Become Privilege Escalation',
dataContainer: "body" dataContainer: "body",
}, labelClass: 'stack-inline'
allow_callbacks: { }, {
name: 'allow_callbacks',
label: 'Allow Provisioning Callbacks', label: 'Allow Provisioning Callbacks',
type: 'checkbox', type: 'checkbox',
addRequired: false, addRequired: false,
@@ -247,7 +252,9 @@ export default
"using this job template.</p>", "using this job template.</p>",
dataPlacement: 'right', dataPlacement: 'right',
dataTitle: 'Allow Provisioning Callbacks', dataTitle: 'Allow Provisioning Callbacks',
dataContainer: "body" dataContainer: "body",
labelClass: 'stack-inline'
}]
}, },
callback_url: { callback_url: {
label: 'Provisioning Callback URL', label: 'Provisioning Callback URL',

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

@@ -110,6 +110,11 @@ angular.module('JobTemplatesHelper', ['Utilities'])
master[form.fields[fld].sourceModel + '_' + form.fields[fld].sourceField] = master[form.fields[fld].sourceModel + '_' + form.fields[fld].sourceField] =
scope[form.fields[fld].sourceModel + '_' + form.fields[fld].sourceField]; scope[form.fields[fld].sourceModel + '_' + form.fields[fld].sourceField];
} }
if (form.fields[fld].type === 'checkbox_group') {
for(var j=0; j<form.fields[fld].fields.length; j++) {
scope[form.fields[fld].fields[j].name] = data[form.fields[fld].fields[j].name];
}
}
} }
Wait('stop'); Wait('stop');
scope.url = data.url; scope.url = data.url;

9
awx/ui/client/src/job-templates/add/job-templates-add.controller.js
View File

@@ -482,7 +482,14 @@
if (form.fields[fld].type === 'select' && if (form.fields[fld].type === 'select' &&
fld !== 'playbook') { fld !== 'playbook') {
data[fld] = $scope[fld].value; data[fld] = $scope[fld].value;
} else { }
else if(form.fields[fld].type === 'checkbox_group') {
// Loop across the checkboxes
for(var i=0; i<form.fields[fld].fields.length; i++) {
data[form.fields[fld].fields[i].name] = $scope[form.fields[fld].fields[i].name];
}
}
else {
if (fld !== 'variables' && if (fld !== 'variables' &&
fld !== 'survey') { fld !== 'survey') {
data[fld] = $scope[fld]; data[fld] = $scope[fld];

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

@@ -599,7 +599,14 @@ export default
if (form.fields[fld].type === 'select' && if (form.fields[fld].type === 'select' &&
fld !== 'playbook') { fld !== 'playbook') {
data[fld] = $scope[fld].value; data[fld] = $scope[fld].value;
} else { }
else if(form.fields[fld].type === 'checkbox_group') {
// Loop across the checkboxes
for(var i=0; i<form.fields[fld].fields.length; i++) {
data[form.fields[fld].fields[i].name] = $scope[form.fields[fld].fields[i].name];
}
}
else {
if (fld !== 'variables' && if (fld !== 'variables' &&
fld !== 'survey') { fld !== 'survey') {
data[fld] = $scope[fld]; data[fld] = $scope[fld];