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

Merge pull request #2247 from jlmitch5/fixAddOrgAndNewListSearch

Browse Source 
Fix add org and new list search
This commit is contained in:
John Mitchell
2018-06-21 10:21:04 -04:00
committed by GitHub
parent f38b01c80e e89f9b62f5
commit abe7d3b084
7 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/ui/client/src/organizations/add/organizations-add.controller.js
View File

@@ -26,8 +26,9 @@ export default ['$scope', '$rootScope', '$location', '$stateParams',
function init(){ function init(){
// @issue What is this doing, why // @issue What is this doing, why
$scope.$emit("HideOrgListHeader"); $scope.$emit("HideOrgListHeader");
$scope.custom_virtualenvs_visible = ConfigData.custom_virtualenvs.length > 1; const virtualEnvs = ConfigData.custom_virtualenvs || [];
$scope.custom_virtualenvs_options = ConfigData.custom_virtualenvs.filter( $scope.custom_virtualenvs_visible = virtualEnvs.length > 1;
$scope.custom_virtualenvs_options = virtualEnvs.filter(
v => !/\/ansible\/$/.test(v) v => !/\/ansible\/$/.test(v)
); );
CreateSelect2({ CreateSelect2({

5
awx/ui/client/src/organizations/edit/organizations-edit.controller.js
View File

@@ -34,8 +34,9 @@ export default ['$scope', '$location', '$stateParams', 'OrgAdminLookup',
$scope.$emit("HideOrgListHeader"); $scope.$emit("HideOrgListHeader");
$scope.instance_groups = InstanceGroupsData; $scope.instance_groups = InstanceGroupsData;
$scope.custom_virtualenvs_visible = ConfigData.custom_virtualenvs.length > 1; const virtualEnvs = ConfigData.custom_virtualenvs || [];
$scope.custom_virtualenvs_options = ConfigData.custom_virtualenvs.filter( $scope.custom_virtualenvs_visible = virtualEnvs.length > 1;
$scope.custom_virtualenvs_options = virtualEnvs.filter(
v => !/\/ansible\/$/.test(v) v => !/\/ansible\/$/.test(v)
); );
} }

3
awx/ui/client/src/projects/add/projects-add.controller.js
View File

@@ -21,7 +21,8 @@ export default ['$scope', '$location', '$stateParams', 'GenerateForm',
function init() { function init() {
$scope.canEditOrg = true; $scope.canEditOrg = true;
$scope.custom_virtualenvs_options = ConfigData.custom_virtualenvs; const virtualEnvs = ConfigData.custom_virtualenvs || [];
$scope.custom_virtualenvs_options = virtualEnvs;
Rest.setUrl(GetBasePath('projects')); Rest.setUrl(GetBasePath('projects'));
Rest.options() Rest.options()

3
awx/ui/client/src/projects/edit/projects-edit.controller.js
View File

@@ -25,7 +25,8 @@ export default ['$scope', '$rootScope', '$stateParams', 'ProjectsForm', 'Rest',
function init() { function init() {
$scope.project_local_paths = []; $scope.project_local_paths = [];
$scope.base_dir = ''; $scope.base_dir = '';
$scope.custom_virtualenvs_options = ConfigData.custom_virtualenvs; const virtualEnvs = ConfigData.custom_virtualenvs || [];
$scope.custom_virtualenvs_options = virtualEnvs;
} }
$scope.$watch('project_obj.summary_fields.user_capabilities.edit', function(val) { $scope.$watch('project_obj.summary_fields.user_capabilities.edit', function(val) {

4
awx/ui/client/src/shared/smart-search/smart-search.controller.js
View File

@@ -77,6 +77,7 @@ function SmartSearchController (
} }
$scope.dataset = res.data; $scope.dataset = res.data;
$scope.collection = res.data.results; $scope.collection = res.data.results;
$scope.$emit('updateDataset', res.data);
}); });
$scope.searchTerm = null; $scope.searchTerm = null;
@@ -200,6 +201,7 @@ function SmartSearchController (
} }
$scope.dataset = data; $scope.dataset = data;
$scope.collection = data.results; $scope.collection = data.results;
$scope.$emit('updateDataset', data);
}) })
.catch(() => revertSearch(unmodifiedQueryset)); .catch(() => revertSearch(unmodifiedQueryset));
@@ -234,6 +236,7 @@ function SmartSearchController (
} }
$scope.dataset = data; $scope.dataset = data;
$scope.collection = data.results; $scope.collection = data.results;
$scope.$emit('updateDataset', data);
}); });
generateSearchTags(); generateSearchTags();
@@ -263,6 +266,7 @@ function SmartSearchController (
} }
$scope.dataset = data; $scope.dataset = data;
$scope.collection = data.results; $scope.collection = data.results;
$scope.$emit('updateDataset', data);
}); });
$scope.searchTags = qs.stripDefaultParams(queryset, defaults); $scope.searchTags = qs.stripDefaultParams(queryset, defaults);

3
awx/ui/client/src/templates/job_templates/add-job-template/job-template-add.controller.js
View File

@@ -89,7 +89,8 @@
} }
} }
$scope.job_type = $scope.job_type_options[form.fields.job_type.default]; $scope.job_type = $scope.job_type_options[form.fields.job_type.default];
$scope.custom_virtualenvs_options = ConfigData.custom_virtualenvs; const virtualEnvs = ConfigData.custom_virtualenvs || [];
$scope.custom_virtualenvs_options = virtualEnvs;
CreateSelect2({ CreateSelect2({
element:'#job_template_job_type', element:'#job_template_job_type',

3
awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js
View File

@@ -62,7 +62,8 @@ export default
$scope.surveyTooltip = i18n._('Surveys allow users to be prompted at job launch with a series of questions related to the job. This allows for variables to be defined that affect the playbook run at time of launch.'); $scope.surveyTooltip = i18n._('Surveys allow users to be prompted at job launch with a series of questions related to the job. This allows for variables to be defined that affect the playbook run at time of launch.');
$scope.job_tag_options = []; $scope.job_tag_options = [];
$scope.skip_tag_options = []; $scope.skip_tag_options = [];
$scope.custom_virtualenvs_options = ConfigData.custom_virtualenvs; const virtualEnvs = ConfigData.custom_virtualenvs || [];
$scope.custom_virtualenvs_options = virtualEnvs;
SurveyControllerInit({ SurveyControllerInit({
scope: $scope, scope: $scope,