zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-05-17 07:48:39 -05:00
Code Issues Packages Projects Releases Wiki Activity

allow the bundled ansible virtualenv to be selected on JT/Proj

Browse Source 
see: https://github.com/ansible/awx/issues/34
This commit is contained in:
Ryan Petrello
2018-06-15 16:44:55 -04:00
parent 7aa835abd4
commit eb9083c447
7 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
awx/ui/client/src/organizations/add/organizations-add.controller.js
+4 -1
View File
@@ -26,7 +26,10 @@ export default ['$scope', '$rootScope', '$location', '$stateParams',
function init(){
// @issue What is this doing, why
$scope.$emit("HideOrgListHeader");
$scope.custom_virtualenvs_options = ConfigData.custom_virtualenvs;
$scope.custom_virtualenvs_visible = ConfigData.custom_virtualenvs.length > 1;
$scope.custom_virtualenvs_options = ConfigData.custom_virtualenvs.filter(
v => !/\/ansible\/$/.test(v)
);
CreateSelect2({
element: '#organization_custom_virtualenv',
multiple: false,
awx/ui/client/src/organizations/edit/organizations-edit.controller.js
+4 -1
View File
@@ -34,7 +34,10 @@ export default ['$scope', '$location', '$stateParams', 'OrgAdminLookup',
$scope.$emit("HideOrgListHeader");
$scope.instance_groups = InstanceGroupsData;
$scope.custom_virtualenvs_options = ConfigData.custom_virtualenvs;
$scope.custom_virtualenvs_visible = ConfigData.custom_virtualenvs.length > 1;
$scope.custom_virtualenvs_options = ConfigData.custom_virtualenvs.filter(
v => !/\/ansible\/$/.test(v)
);
}
awx/ui/client/src/organizations/organizations.form.js
+2 -2
View File
@@ -45,7 +45,7 @@ export default ['NotificationsList', 'i18n',
},
custom_virtualenv: {
label: i18n._('Ansible Environment'),
defaultText: i18n._('Default Environment'),
defaultText: i18n._('Use Default Environment'),
type: 'select',
ngOptions: 'venv for venv in custom_virtualenvs_options track by venv',
awPopOver: "<p>" + i18n._("Select the custom Python virtual environment for this organization to run on.") + "</p>",
@@ -53,7 +53,7 @@ export default ['NotificationsList', 'i18n',
dataContainer: 'body',
dataPlacement: 'right',
ngDisabled: '!(organization_obj.summary_fields.user_capabilities.edit || canAdd)',
ngShow: 'custom_virtualenvs_options.length > 0'
ngShow: 'custom_virtualenvs_visible'
}
},
awx/ui/client/src/projects/projects.form.js
+2 -2
View File
@@ -206,14 +206,14 @@ export default ['i18n', 'NotificationsList', 'TemplateList',
custom_virtualenv: {
label: i18n._('Ansible Environment'),
type: 'select',
defaultText: i18n._('Default Environment'),
defaultText: i18n._('Use Default Environment'),
ngOptions: 'venv for venv in custom_virtualenvs_options track by venv',
awPopOver: "<p>" + i18n._("Select the custom Python virtual environment for this project to run on.") + "</p>",
dataTitle: i18n._('Ansible Environment'),
dataContainer: 'body',
dataPlacement: 'right',
ngDisabled: '!(project_obj.summary_fields.user_capabilities.edit || canAdd)',
ngShow: 'custom_virtualenvs_options.length > 0'
ngShow: 'custom_virtualenvs_options.length > 1'
},
},
awx/ui/client/src/templates/job_templates/job-template.form.js
+3 -2
View File
@@ -234,14 +234,15 @@ function(NotificationsList, i18n) {
custom_virtualenv: {
label: i18n._('Ansible Environment'),
type: 'select',
defaultText: i18n._('Default Environment'),
defaultText: i18n._('Use Default Environment'),
ngOptions: 'venv for venv in custom_virtualenvs_options track by venv',
awPopOver: "<p>" + i18n._("Select the custom Python virtual environment for this job template to run on.") + "</p>",
dataTitle: i18n._('Ansible Environment'),
dataContainer: 'body',
dataPlacement: 'right',
ngDisabled: '!(job_template_obj.summary_fields.user_capabilities.edit || canAdd)',
ngShow: 'custom_virtualenvs_options.length > 0'
ngShow: 'custom_virtualenvs_options.length > 1'
},
instance_groups: {
label: i18n._('Instance Groups'),