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

Merge pull request #507 from AlanCoding/adhoc_word_smithing

Browse Source 
[3.2.2] feedback on ad hoc prohibited vars error msg
This commit is contained in:
Alan Rominger 2017-10-06 14:15:16 -04:00 committed by GitHub
commit 2dd2541550
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
awx/api/serializers.py
View File

@ -2763,8 +2763,8 @@ class AdHocCommandSerializer(UnifiedJobSerializer):
redacted_extra_vars, removed_vars = extract_ansible_vars(value)
if removed_vars:
raise serializers.ValidationError(_(
"Variables {} are prohibited from use in ad hoc commands."
).format(",".join(removed_vars)))
"{} are prohibited from use in ad hoc commands."
).format(", ".join(removed_vars)))
return vars_validate_or_raise(value)

4
awx/main/tasks.py
View File

@ -2142,8 +2142,8 @@ class RunAdHocCommand(BaseTask):
redacted_extra_vars, removed_vars = extract_ansible_vars(ad_hoc_command.extra_vars_dict)
if removed_vars:
raise ValueError(_(
"unable to use {} variables with ad hoc commands"
).format(",".format(removed_vars)))
"{} are prohibited from use in ad hoc commands."
).format(", ".join(removed_vars)))
args.extend(['-e', json.dumps(ad_hoc_command.extra_vars_dict)])