External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-15 11:50:42 -03:30
Code Issues Packages Projects Releases Wiki Activity

Use ternary operator in Org Edit form

Browse Source
This commit is contained in:
Marliana Lara 2019-02-26 14:21:27 -05:00
parent a7b51c526a
commit 053b21e832
No known key found for this signature in database
GPG Key ID: 38C73B40DFA809EE
1 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/pages/Organizations/screens/Organization/OrganizationEdit.jsx
View File

@ -43,8 +43,8 @@ class OrganizationEdit extends Component {
value: ''
},
instanceGroups: {
value: null,
initialValue: null
value: [],
initialValue: []
},
custom_virtualenv: {
value: '',
@ -84,11 +84,10 @@ class OrganizationEdit extends Component {
updatedFormEl.value = value;
updatedForm[targetName] = updatedFormEl;
let formIsValid = true;
if (updatedFormEl.validation) {
updatedFormEl.isValid = this.checkValidity(updatedFormEl.value, updatedFormEl.validation);
formIsValid = updatedFormEl.isValid && formIsValid;
}
updatedFormEl.isValid = (updatedFormEl.validation)
? this.checkValidity(updatedFormEl.value, updatedFormEl.validation) : true;
const formIsValid = (updatedFormEl.validation) ? updatedFormEl.isValid : true;
this.setState({ form: updatedForm, formIsValid });
}
@ -148,10 +147,9 @@ class OrganizationEdit extends Component {
}
checkValidity = (value, validation) => {
let isValid = true;
if (validation.required) {
isValid = value.trim() !== '' && isValid;
}
const isValid = (validation.required)
? (value.trim() !== '') : true;
return isValid;
}
@ -255,19 +253,15 @@ class OrganizationEdit extends Component {
fieldId="edit-org-form-instance-groups"
label={i18n._(t`Instance Groups`)}
>
{ instanceGroups.value
&& (
<Lookup
columns={instanceGroupsLookupColumns}
getItems={this.getInstanceGroups}
lookupHeader={i18n._(t`Instance Groups`)}
name="instanceGroups"
onLookupSave={this.onLookupSave}
sortedColumnKey="name"
value={instanceGroups.value}
/>
)
}
<Lookup
columns={instanceGroupsLookupColumns}
getItems={this.getInstanceGroups}
lookupHeader={i18n._(t`Instance Groups`)}
name="instanceGroups"
onLookupSave={this.onLookupSave}
sortedColumnKey="name"
value={instanceGroups.value}
/>
</FormGroup>
<FormActionGroup
onCancel={this.onCancel}