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

Merge pull request #563 from jakemcdermott/bug-7718

Browse Source 
append credential types documentation link to popovers
This commit is contained in:
Jake McDermott
2017-10-30 16:24:19 -04:00
committed by GitHub
parent fc7c2117e9 14a3a6073e
commit b0c1be7338
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,8 +37,14 @@ export default ['Rest', 'Wait',
callback: 'loadCredentialKindOptions' callback: 'loadCredentialKindOptions'
}); });
$scope.inputs_help_text = _.get(options, 'actions.POST.inputs.help_text', "Specification for credential type inputs"); const docs_url = 'https://docs.ansible.com/ansible-tower/latest/html/userguide/credential_types.html#getting-started-with-credential-types';
$scope.injectors_help_text = _.get(options, 'actions.POST.injectors.help_text', "Specification for credential type injector"); const docs_help_text = `<br><br><a href=${docs_url}>Getting Started with Credential Types</a>`;
const api_inputs_help_text = _.get(options, 'actions.POST.inputs.help_text', "Specification for credential type inputs.");
const api_injectors_help_text = _.get(options, 'actions.POST.injectors.help_text', "Specification for credential type injector.");
$scope.inputs_help_text = api_inputs_help_text + docs_help_text;
$scope.injectors_help_text = api_injectors_help_text + docs_help_text;
if (!options.actions.POST) { if (!options.actions.POST) {
$state.go("^"); $state.go("^");

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

@@ -36,8 +36,14 @@ export default ['Rest', 'Wait',
callback: 'choicesReadyCredentialTypes' callback: 'choicesReadyCredentialTypes'
}); });
$scope.inputs_help_text = _.get(options, 'actions.POST.inputs.help_text', "Specification for credential type inputs"); const docs_url = 'https://docs.ansible.com/ansible-tower/latest/html/userguide/credential_types.html#getting-started-with-credential-types';
$scope.injectors_help_text = _.get(options, 'actions.POST.injectors.help_text', "Specification for credential type injector"); const docs_help_text = `<br><br><a href=${docs_url}>Getting Started with Credential Types</a>`;
const api_inputs_help_text = _.get(options, 'actions.POST.inputs.help_text', "Specification for credential type inputs.");
const api_injectors_help_text = _.get(options, 'actions.POST.injectors.help_text', "Specification for credential type injector.");
$scope.inputs_help_text = api_inputs_help_text + docs_help_text;
$scope.injectors_help_text = api_injectors_help_text + docs_help_text;
}); });
} }