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

add static messages to workflow inventory lookups

Browse Source
This commit is contained in:
Jake McDermott
2018-11-11 21:56:59 -05:00
parent 9917841585
commit 9a4667c6c7
4 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/client/src/shared/list-generator/list-generator.factory.js
View File

@@ -494,6 +494,10 @@ export default ['$compile', 'Attr', 'Icon',
html += `></paginate></div>`; html += `></paginate></div>`;
} }
if (options.mode === 'lookup' && options.lookupMessage) {
html = `<div class="Prompt-bodyQuery">${options.lookupMessage}</div>` + html;
}
return html; return html;
}, },

12
awx/ui/client/src/shared/stateDefinitions.factory.js
View File

@@ -806,13 +806,19 @@ function($injector, $stateExtender, $log, i18n) {
views: { views: {
'modal': { 'modal': {
templateProvider: function(ListDefinition, generateList) { templateProvider: function(ListDefinition, generateList) {
let list_html = generateList.build({ const listConfig = {
mode: 'lookup', mode: 'lookup',
list: ListDefinition, list: ListDefinition,
input_type: 'radio' input_type: 'radio'
}); };
return `<lookup-modal>${list_html}</lookup-modal>`;
if (field.lookupMessage) {
listConfig.lookupMessage = field.lookupMessage;
}
let list_html = generateList.build(listConfig);
return `<lookup-modal>${list_html}</lookup-modal>`;
} }
} }
}, },

17
awx/ui/client/src/templates/prompt/steps/inventory/prompt-inventory.directive.js
View File

@@ -6,8 +6,8 @@
import promptInventoryController from './prompt-inventory.controller'; import promptInventoryController from './prompt-inventory.controller';
export default [ 'templateUrl', 'QuerySet', 'GetBasePath', 'generateList', '$compile', 'InventoryList', export default [ 'templateUrl', 'QuerySet', 'GetBasePath', 'generateList', '$compile', 'InventoryList', 'i18n',
(templateUrl, qs, GetBasePath, GenerateList, $compile, InventoryList) => { (templateUrl, qs, GetBasePath, GenerateList, $compile, InventoryList, i18n) => {
return { return {
scope: { scope: {
promptData: '=', promptData: '=',
@@ -46,11 +46,18 @@ export default [ 'templateUrl', 'QuerySet', 'GetBasePath', 'generateList', '$com
let invList = _.cloneDeep(InventoryList); let invList = _.cloneDeep(InventoryList);
invList.disableRow = "{{ readOnlyPrompts }}"; invList.disableRow = "{{ readOnlyPrompts }}";
invList.disableRowValue = "readOnlyPrompts"; invList.disableRowValue = "readOnlyPrompts";
let html = GenerateList.build({
const listConfig = {
list: invList, list: invList,
input_type: 'radio', input_type: 'radio',
mode: 'lookup' mode: 'lookup',
}); };
if (scope.promptData.templateType === "workflow_job_template") {
listConfig.lookupMessage = i18n._("This inventory is applied to all job templates nodes that prompt for an inventory.");
}
let html = GenerateList.build(listConfig);
scope.list = invList; scope.list = invList;

1
awx/ui/client/src/templates/workflows.form.js
View File

@@ -71,6 +71,7 @@ export default ['NotificationsList', 'i18n', function(NotificationsList, i18n) {
inventory: { inventory: {
label: i18n._('Inventory'), label: i18n._('Inventory'),
type: 'lookup', type: 'lookup',
lookupMessage: i18n._("This inventory is applied to all job templates nodes that prompt for an inventory."),
basePath: 'inventory', basePath: 'inventory',
list: 'InventoryList', list: 'InventoryList',
sourceModel: 'inventory', sourceModel: 'inventory',