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

Fixed extra_vars on job_templates and jobs detail pages. No longer attempts to compile string into a JSON object. Assumes user will enter valid JSON or key=value pairs. Updated help text to reflect this and link to ansibleworks.com documentation on --extra-vars parameter.

Browse Source
This commit is contained in:
chouseknecht
2013-06-12 11:10:16 -04:00
parent c8c9e62b4c
commit e1d714a335
3 changed files with 46 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ansibleworks/ui/static/js/forms/JobTemplates.js
View File

@@ -136,11 +136,9 @@ angular.module('JobTemplateFormDefinition', [])
editRequired: false,
"default": "\{\}",
column: 2,
awPopOver: "<p>Enter variables as JSON. Both the key and value must be wrapped in double quotes. " +
"Separate variables with commas, and wrap the entire string with { }. " +
"&nbsp;For example:</p><p>{<br\>&quot;ntp_server&quot;: &quot;ntp.example.com&quot;,<br \>" +
'&quot;proxy&quot;: &quot;proxy.example.com&quot;<br \>}</p><p>See additional JSON examples at <a href="' +
'http://www.json.org" target="_blank">www.json.org</a></p>',
awPopOver: "<p>Pass extra command line variables to the playbook. This is the -e or --extra-vars command line parameter " +
"for ansible-playbook. Provide key=value pairs or JSON. <p><a href=\"http://www.ansibleworks.com/docs/playbooks2.html" +
"#passing-variables-on-the-command-line\" target=\"_blank\">Click here to view documentation and examples.</a></p>",
dataTitle: 'Extra Variables',
dataPlacement: 'left'
}

3
ansibleworks/ui/static/js/forms/Jobs.js
View File

@@ -129,6 +129,9 @@ angular.module('JobFormDefinition', [])
"class": 'span12',
addRequired: false,
editRequired: false,
awPopOver: "<p>Pass extra command line variables to the playbook. This is the -e or --extra-vars command line parameter " +
"for ansible-playbook. Provide key=value pairs or JSON. <p><a href=\"http://www.ansibleworks.com/docs/playbooks2.html" +
"#passing-variables-on-the-command-line\" target=\"_blank\">Click here to view documentation and examples.</a></p>",
column: 2
}
},