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

Allow one to select non-global execution environments for organizations

Browse Source 
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
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
awx/ui_next/src/screens/Organization/shared/OrganizationForm.jsx
View File

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