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

Pull Credential input and injector help_text from API

Browse Source
This commit is contained in:
Marliana Lara
2017-08-04 13:58:08 -04:00
parent 8fd7a94c62
commit 605432dda2
4 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/ui/client/src/credential-types/add/add.controller.js
View File

@@ -37,6 +37,9 @@ export default ['Rest', 'Wait',
callback: 'loadCredentialKindOptions' callback: 'loadCredentialKindOptions'
}); });
$scope.inputs_help_text = options.actions.POST.inputs.help_text;
$scope.injectors_help_text = options.actions.POST.injectors.help_text;
if (!options.actions.POST) { if (!options.actions.POST) {
$state.go("^"); $state.go("^");
Alert('Permission Error', 'You do not have permission to add a credential type.', 'alert-info'); Alert('Permission Error', 'You do not have permission to add a credential type.', 'alert-info');

4
awx/ui/client/src/credential-types/credential-types.form.js
View File

@@ -43,7 +43,7 @@ export default ['i18n', function(i18n) {
default: '---', default: '---',
showParseTypeToggle: true, showParseTypeToggle: true,
parseTypeName: 'parseTypeInputs', parseTypeName: 'parseTypeInputs',
awPopOver: i18n._("Enter inputs using either JSON or YAML syntax. Use the radio button to toggle between the two. Refer to the Ansible Tower documentation for example syntax."), awPopOverWatch: "inputs_help_text",
dataTitle: i18n._('Input Configuration'), dataTitle: i18n._('Input Configuration'),
dataPlacement: 'right', dataPlacement: 'right',
dataContainer: "body", dataContainer: "body",
@@ -57,7 +57,7 @@ export default ['i18n', function(i18n) {
default: '---', default: '---',
showParseTypeToggle: true, showParseTypeToggle: true,
parseTypeName: 'parseTypeInjectors', parseTypeName: 'parseTypeInjectors',
awPopOver: i18n._("Enter injectors using either JSON or YAML syntax. Use the radio button to toggle between the two. Refer to the Ansible Tower documentation for example syntax."), awPopOverWatch: "injectors_help_text",
dataTitle: i18n._('Injector Configuration'), dataTitle: i18n._('Injector Configuration'),
dataPlacement: 'right', dataPlacement: 'right',
dataContainer: "body", dataContainer: "body",

3
awx/ui/client/src/credential-types/edit/edit.controller.js
View File

@@ -35,6 +35,9 @@ export default ['Rest', 'Wait',
options: options, options: options,
callback: 'choicesReadyCredentialTypes' callback: 'choicesReadyCredentialTypes'
}); });
$scope.inputs_help_text = options.actions.POST.inputs.help_text;
$scope.injectors_help_text = options.actions.POST.injectors.help_text;
}); });
} }

2
awx/ui/client/src/shared/form-generator.js
View File

@@ -658,7 +658,7 @@ angular.module('FormGenerator', [GeneratorHelpers.name, 'Utilities', listGenerat
} else { } else {
html += "\t\t<span class=\"Form-inputLabel\">\n\t\t\t" + field.label + "\n\t\t</span>"; html += "\t\t<span class=\"Form-inputLabel\">\n\t\t\t" + field.label + "\n\t\t</span>";
} }
html += (field.awPopOver && !field.awPopOverRight) ? Attr(field, 'awPopOver', fld) : ""; html += ((field.awPopOver || field.awPopOverWatch) && !field.awPopOverRight) ? Attr(field, 'awPopOver', fld) : "";
html += (field.hintText) ? "\n\t\t<span class=\"label-hint-text\">\n\t\t\t<i class=\"fa fa-info-circle\">\n\t\t\t</i>\n\t\t\tHint: " + field.hintText + "\n\t\t</span>" : ""; html += (field.hintText) ? "\n\t\t<span class=\"label-hint-text\">\n\t\t\t<i class=\"fa fa-info-circle\">\n\t\t\t</i>\n\t\t\tHint: " + field.hintText + "\n\t\t</span>" : "";
// Variable editing // Variable editing
if (fld === "variables" || fld === "extra_vars" || _.last(fld.split('_')) === 'variables' || fld === 'source_vars' || field.showParseTypeToggle === true) { if (fld === "variables" || fld === "extra_vars" || _.last(fld.split('_')) === 'variables' || fld === 'source_vars' || field.showParseTypeToggle === true) {