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

Merge pull request #7101 from keithjgrant/5996-inventory-removable

Browse Source 
make Inventory optional if prompt-on-launch is true

Reviewed-by: Daniel Sami
             https://github.com/dsesami
This commit is contained in:
softwarefactory-project-zuul[bot]
2020-05-26 20:01:56 +00:00
committed by GitHub
parent a480e79e21 455dfa6caa
commit d239c82ff5
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/ui_next/src/screens/Template/shared/JobTemplateForm.jsx
View File

@@ -231,7 +231,7 @@ function JobTemplateForm({
</FieldWithPrompt> </FieldWithPrompt>
<FieldWithPrompt <FieldWithPrompt
fieldId="template-inventory" fieldId="template-inventory"
isRequired isRequired={!formikValues.ask_inventory_on_launch}
label={i18n._(t`Inventory`)} label={i18n._(t`Inventory`)}
promptId="template-ask-inventory-on-launch" promptId="template-ask-inventory-on-launch"
promptName="ask_inventory_on_launch" promptName="ask_inventory_on_launch"
@@ -242,10 +242,10 @@ function JobTemplateForm({
value={inventory} value={inventory}
onBlur={() => inventoryHelpers.setTouched()} onBlur={() => inventoryHelpers.setTouched()}
onChange={value => { onChange={value => {
inventoryHelpers.setValue(value.id); inventoryHelpers.setValue(value ? value.id : null);
setInventory(value); setInventory(value);
}} }}
required required={!formikValues.ask_inventory_on_launch}
touched={inventoryMeta.touched} touched={inventoryMeta.touched}
error={inventoryMeta.error} error={inventoryMeta.error}
/> />