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

adhoc ui fixes

Browse Source
This commit is contained in:
John Mitchell
2015-09-28 10:47:12 -04:00
parent f1f9f5f982
commit 2e43ed0405
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/ui/client/src/adhoc/adhoc.controller.js
View File

@@ -159,7 +159,7 @@ function adhocController($q, $scope, $rootScope, $location, $routeParams,
privateFn.initializeForm = function(id, urls, hostPattern) { privateFn.initializeForm = function(id, urls, hostPattern) {
// inject the adhoc command form // inject the adhoc command form
GenerateForm.inject(adhocForm, GenerateForm.inject(adhocForm,
{ mode: 'edit', related: true, scope: $scope }); { mode: 'add', related: true, scope: $scope });
// set when "working" starts and stops // set when "working" starts and stops
privateFn.setLoadingStartStop(); privateFn.setLoadingStartStop();
@@ -210,7 +210,7 @@ function adhocController($q, $scope, $rootScope, $location, $routeParams,
data = { data = {
"job_type": "run", "job_type": "run",
"limit": "", "limit": "",
"credential": null, "credential": "",
"module_name": "command", "module_name": "command",
"module_args": "", "module_args": "",
"forks": 0, "forks": 0,
@@ -224,7 +224,7 @@ function adhocController($q, $scope, $rootScope, $location, $routeParams,
for (fld in adhocForm.fields) { for (fld in adhocForm.fields) {
if (adhocForm.fields[fld].type === 'select') { if (adhocForm.fields[fld].type === 'select') {
data[fld] = $scope[fld].value; data[fld] = $scope[fld].value;
} else { } else if ($scope[fld]) {
data[fld] = $scope[fld]; data[fld] = $scope[fld];
} }
} }

11
awx/ui/client/src/adhoc/adhoc.form.js
View File

@@ -25,7 +25,7 @@ export default function() {
ngOptions: 'module.label for module in adhoc_module_options' + ngOptions: 'module.label for module in adhoc_module_options' +
' track by module.value', ' track by module.value',
ngChange: 'moduleChange()', ngChange: 'moduleChange()',
editRequired: true, addRequired: true,
awPopOver:'<p>These are the modules that Tower supports ' + awPopOver:'<p>These are the modules that Tower supports ' +
'running commands against.', 'running commands against.',
dataTitle: 'Module', dataTitle: 'Module',
@@ -40,14 +40,13 @@ export default function() {
dataTitle: 'Arguments', dataTitle: 'Arguments',
dataPlacement: 'right', dataPlacement: 'right',
dataContainer: 'body', dataContainer: 'body',
editRequired: false, addRequired: false,
autocomplete: false autocomplete: false
}, },
limit: { limit: {
label: 'Host Pattern', label: 'Host Pattern',
type: 'text', type: 'text',
addRequired: false, addRequired: false,
editRequired: false,
awPopOver: '<p>The pattern used to target hosts in the ' + awPopOver: '<p>The pattern used to target hosts in the ' +
'inventory. Leaving the field blank, all, and * will ' + 'inventory. Leaving the field blank, all, and * will ' +
'all target all hosts in the inventory. You can find ' + 'all target all hosts in the inventory. You can find ' +
@@ -83,7 +82,6 @@ export default function() {
label: 'Enable Privilege Escalation', label: 'Enable Privilege Escalation',
type: 'checkbox', type: 'checkbox',
addRequired: false, addRequired: false,
editRequired: false,
column: 2, column: 2,
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</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</code> command. </p>",
dataPlacement: 'right', dataPlacement: 'right',
@@ -97,7 +95,7 @@ export default function() {
ngOptions: 'verbosity.label for verbosity in ' + ngOptions: 'verbosity.label for verbosity in ' +
'adhoc_verbosity_options ' + 'adhoc_verbosity_options ' +
'track by verbosity.value', 'track by verbosity.value',
editRequired: true, addRequired: true,
awPopOver:'<p>These are the verbosity levels for standard ' + awPopOver:'<p>These are the verbosity levels for standard ' +
'out of the command run that are supported.', 'out of the command run that are supported.',
dataTitle: 'Module', dataTitle: 'Module',
@@ -113,8 +111,7 @@ export default function() {
min: 0, min: 0,
spinner: true, spinner: true,
"default": 0, "default": 0,
addRequired: false, addRequired: true,
editRequired: true,
'class': "input-small", 'class': "input-small",
column: 1, column: 1,
awPopOver: '<p>The number of parallel or simultaneous processes to use while executing the command. 0 signifies ' + awPopOver: '<p>The number of parallel or simultaneous processes to use while executing the command. 0 signifies ' +