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

Removes rogue comment and marks JT inventory validation string for translation.

Browse Source
This commit is contained in:
mabashian
2020-02-19 15:50:12 -05:00
parent 0582079606
commit 0e663921d6
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui_next/src/components/Lookup/InventoryLookup.jsx
View File

@@ -17,8 +17,6 @@ const QS_CONFIG = getQSConfig('inventory', {
}); });
function InventoryLookup({ value, onChange, onBlur, required, i18n, history }) { function InventoryLookup({ value, onChange, onBlur, required, i18n, history }) {
// some stuff was stripped out of this component - need to propagate those changes
// out to other forms that use this lookup
const [inventories, setInventories] = useState([]); const [inventories, setInventories] = useState([]);
const [count, setCount] = useState(0); const [count, setCount] = useState(0);
const [error, setError] = useState(null); const [error, setError] = useState(null);

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

@@ -1370,15 +1370,16 @@ const FormikApp = withFormik({
setErrors(errors); setErrors(errors);
} }
}, },
validate: values => { validate: (values, { i18n }) => {
const errors = {}; const errors = {};
if ( if (
(!values.inventory || values.inventory === '') && (!values.inventory || values.inventory === '') &&
!values.ask_inventory_on_launch !values.ask_inventory_on_launch
) { ) {
errors.inventory = errors.inventory = i18n._(
'Please select an Inventory or check the Prompt on Launch option.'; t`Please select an Inventory or check the Prompt on Launch option.`
);
} }
return errors; return errors;