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

Merge pull request #3373 from AlexSCorey/2960-addTemplateTitlePromptDiag

Browse Source 
add template name to launch prompt modal.

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot]
2019-03-07 15:21:45 +00:00
committed by GitHub
parent 92a600aaa9 0593ac197c
commit f95576764d
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/client/lib/components/launchTemplateButton/launchTemplateButton.component.js
View File

@@ -68,6 +68,7 @@ function atLaunchTemplateCtrl (
launchConf: launchData.data, launchConf: launchData.data,
launchOptions: launchOptions.data, launchOptions: launchOptions.data,
template: vm.template.id, template: vm.template.id,
templateName: vm.template.name,
templateType: vm.template.type, templateType: vm.template.type,
prompts: PromptService.processPromptValues({ prompts: PromptService.processPromptValues({
launchConf: launchData.data, launchConf: launchData.data,
@@ -122,6 +123,7 @@ function atLaunchTemplateCtrl (
launchConf: selectedWorkflowJobTemplate.getLaunchConf(), launchConf: selectedWorkflowJobTemplate.getLaunchConf(),
launchOptions: launchOptions.data, launchOptions: launchOptions.data,
template: vm.template.id, template: vm.template.id,
templateName: vm.template.name,
templateType: vm.template.type, templateType: vm.template.type,
prompts: PromptService.processPromptValues({ prompts: PromptService.processPromptValues({
launchConf: selectedWorkflowJobTemplate.getLaunchConf(), launchConf: selectedWorkflowJobTemplate.getLaunchConf(),

6
awx/ui/client/src/templates/prompt/prompt.controller.js
View File

@@ -1,5 +1,5 @@
export default [ 'ProcessErrors', 'CredentialTypeModel', 'TemplatesStrings', export default [ 'ProcessErrors', 'CredentialTypeModel', 'TemplatesStrings', '$filter',
function (ProcessErrors, CredentialType, strings) { function (ProcessErrors, CredentialType, strings, $filter) {
const vm = this || {}; const vm = this || {};
@@ -181,7 +181,7 @@ export default [ 'ProcessErrors', 'CredentialTypeModel', 'TemplatesStrings',
} }
vm.steps.preview.tab.order = order; vm.steps.preview.tab.order = order;
vm.steps.preview.tab._disabled = vm.readOnlyPrompts ? false : true; vm.steps.preview.tab._disabled = vm.readOnlyPrompts ? false : true;
modal.show(strings.get('prompt.PROMPT')); modal.show($filter('sanitize')(vm.promptDataClone.templateName));
vm.promptData.triggerModalOpen = false; vm.promptData.triggerModalOpen = false;
modal.onClose = () => { modal.onClose = () => {