Skip to content

Commit

Permalink
remove changes to root.py to keep the custom virtualenvs listed in ap…
Browse files Browse the repository at this point in the history
…i/config
  • Loading branch information
rebeccahhh committed Jun 4, 2021
1 parent bd2da80 commit baade77
Showing 1 changed file with 11 additions and 3 deletions.
14 changes: 11 additions & 3 deletions awx/api/views/root.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@
from awx.conf.registry import settings_registry
from awx.main.analytics import all_collectors
from awx.main.ha import is_ha_environment
from awx.main.utils import get_awx_version
from awx.main.utils import get_awx_version, get_custom_venv_choices
from awx.main.utils.licensing import validate_entitlement_manifest
from awx.api.versioning import reverse, drf_reverse
from awx.main.constants import PRIVILEGE_ESCALATION_METHODS
from awx.main.models import Project, Organization, Instance, InstanceGroup
from awx.main.models import Project, Organization, Instance, InstanceGroup, JobTemplate
from awx.main.utils import set_environ

logger = logging.getLogger('awx.api.views.root')
Expand Down Expand Up @@ -300,7 +300,15 @@ def get(self, request, format=None):
or Organization.accessible_objects(request.user, 'auditor_role').exists()
or Organization.accessible_objects(request.user, 'project_admin_role').exists()
):
data.update(dict(project_base_dir=settings.PROJECTS_ROOT, project_local_paths=Project.get_local_path_choices()))
data.update(
dict(
project_base_dir=settings.PROJECTS_ROOT,
project_local_paths=Project.get_local_path_choices(),
custom_virtualenvs=get_custom_venv_choices(),
)
)
elif JobTemplate.accessible_objects(request.user, 'admin_role').exists():
data['custom_virtualenvs'] = get_custom_venv_choices()

return Response(data)

Expand Down

0 comments on commit baade77

Please sign in to comment.