Allow one to select non-global execution environments for organizations

Allow one to select non-global EE when editing an Organization.

See: https://github.com/ansible/awx/issues/9592
This commit is contained in:
nixocio
2021-03-16 16:32:21 -04:00
parent a2e3bf1030
commit 4db5c496d0

View File

@@ -21,7 +21,12 @@ import { required, minMaxValue } from '../../../util/validators';
import { FormColumnLayout } from '../../../components/FormLayout'; import { FormColumnLayout } from '../../../components/FormLayout';
import CredentialLookup from '../../../components/Lookup/CredentialLookup'; import CredentialLookup from '../../../components/Lookup/CredentialLookup';
function OrganizationFormFields({ i18n, instanceGroups, setInstanceGroups }) { function OrganizationFormFields({
i18n,
instanceGroups,
setInstanceGroups,
organizationId,
}) {
const { license_info = {}, me = {} } = useConfig(); const { license_info = {}, me = {} } = useConfig();
const { custom_virtualenvs } = useContext(ConfigContext); const { custom_virtualenvs } = useContext(ConfigContext);
@@ -124,6 +129,7 @@ function OrganizationFormFields({ i18n, instanceGroups, setInstanceGroups }) {
t`Select the default execution environment for this organization.` t`Select the default execution environment for this organization.`
)} )}
globallyAvailable globallyAvailable
organizationId={organizationId}
isDefaultEnvironment isDefaultEnvironment
/> />
<CredentialLookup <CredentialLookup
@@ -222,6 +228,7 @@ function OrganizationForm({
<OrganizationFormFields <OrganizationFormFields
instanceGroups={instanceGroups} instanceGroups={instanceGroups}
setInstanceGroups={setInstanceGroups} setInstanceGroups={setInstanceGroups}
organizationId={organization?.id || null}
{...rest} {...rest}
/> />
<FormSubmitError error={submitError} /> <FormSubmitError error={submitError} />
@@ -245,6 +252,7 @@ OrganizationForm.propTypes = {
OrganizationForm.defaultProps = { OrganizationForm.defaultProps = {
organization: { organization: {
id: '',
name: '', name: '',
description: '', description: '',
max_hosts: '0', max_hosts: '0',