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

fix conflict

Browse Source
This commit is contained in:
John Mitchell
2020-02-21 13:43:09 -05:00
parent f14eb4327d
commit fd3f410cc6
1 changed files with 0 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
awx/ui_next/src/screens/User/shared/UserForm.jsx
View File

@@ -101,34 +101,6 @@ function UserFormFields({ user, i18n }) {
type="text" type="text"
/> />
{!user.id && ( {!user.id && (
<<<<<<< HEAD
<OrganizationLookup
helperTextInvalid={organizationMeta.error}
isValid={!organizationMeta.touched || !organizationMeta.error}
onBlur={() => organizationHelpers.setTouched()}
onChange={value => {
organizationHelpers.setValue(value.id);
setOrganization(value);
}}
value={organization}
required
/>
)}
<FormGroup
fieldId="user-type"
helperTextInvalid={userTypeMeta.error}
isRequired
isValid={!userTypeMeta.touched || !userTypeMeta.error}
label={i18n._(t`User Type`)}
>
<AnsibleSelect
isValid={!userTypeMeta.touched || !userTypeMeta.error}
id="user-type"
data={userTypeOptions}
{...userTypeField}
/>
</FormGroup>
=======
<OrganizationLookup <OrganizationLookup
helperTextInvalid={organizationMeta.error} helperTextInvalid={organizationMeta.error}
isValid={!organizationMeta.touched || !organizationMeta.error} isValid={!organizationMeta.touched || !organizationMeta.error}
@@ -155,7 +127,6 @@ function UserFormFields({ user, i18n }) {
{...userTypeField} {...userTypeField}
/> />
</FormGroup> </FormGroup>
>>>>>>> update forms from FormRow to using FormLayout components
</> </>
); );
} }