External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-27 07:56:06 -03:30
Code Issues Packages Projects Releases Wiki Activity

remove type search field from single-type credential lookup modals, resolves #2976 (#2985)

Browse Source
This commit is contained in:
Leigh Johnson
2016-07-13 16:36:21 -04:00
committed by GitHub
parent 5c32b17aea
commit c60b8986de
6 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
awx/ui/client/src/controllers/Projects.js
View File

@@ -391,6 +391,9 @@ export function ProjectsAdd(Refresh, $scope, $rootScope, $compile, $location, $l
defaultUrl = GetBasePath('projects'), defaultUrl = GetBasePath('projects'),
master = {}; master = {};
// remove "type" field from search options
CredentialList.fields.kind.noSearch = true;
generator.inject(form, { mode: 'add', related: false, scope: $scope }); generator.inject(form, { mode: 'add', related: false, scope: $scope });
generator.reset(); generator.reset();
@@ -567,6 +570,10 @@ export function ProjectsEdit($scope, $rootScope, $compile, $location, $log,
id = $stateParams.id, id = $stateParams.id,
relatedSets = {}; relatedSets = {};
// remove "type" field from search options
CredentialList.fields.kind.noSearch = true;
SchedulesList.well = false; SchedulesList.well = false;
generator.inject(form, { generator.inject(form, {
mode: 'edit', mode: 'edit',

2
awx/ui/client/src/helpers/JobTemplates.js
View File

@@ -163,6 +163,8 @@ angular.module('JobTemplatesHelper', ['Utilities'])
}); });
CredentialList.basePath = GetBasePath('credentials') + '?kind=ssh'; CredentialList.basePath = GetBasePath('credentials') + '?kind=ssh';
// remove "type" field from search options
CredentialList.fields.kind.noSearch = true;
LookUpInit({ LookUpInit({
url: GetBasePath('credentials') + '?kind=ssh', url: GetBasePath('credentials') + '?kind=ssh',

3
awx/ui/client/src/inventories/manage/groups/groups-add.controller.js
View File

@@ -12,6 +12,9 @@
var generator = GenerateForm, var generator = GenerateForm,
form = GroupForm(); form = GroupForm();
// remove "type" field from search options
CredentialList.fields.kind.noSearch = true;
$scope.formCancel = function(){ $scope.formCancel = function(){
$state.go('^'); $state.go('^');
}; };

4
awx/ui/client/src/inventories/manage/groups/groups-edit.controller.js
View File

@@ -13,6 +13,10 @@
GroupManageService, GetChoices, GetBasePath, CreateSelect2, GetSourceTypeOptions, groupData, inventorySourceData){ GroupManageService, GetChoices, GetBasePath, CreateSelect2, GetSourceTypeOptions, groupData, inventorySourceData){
var generator = GenerateForm, var generator = GenerateForm,
form = GroupForm(); form = GroupForm();
// remove "type" field from search options
CredentialList.fields.kind.noSearch = true;
$scope.formCancel = function(){ $scope.formCancel = function(){
$state.go('^'); $state.go('^');
}; };

4
awx/ui/client/src/job-templates/add/job-templates-add.controller.js
View File

@@ -34,6 +34,9 @@
base = $location.path().replace(/^\//, '').split('/')[0], base = $location.path().replace(/^\//, '').split('/')[0],
context = (base === 'job_templates') ? 'job_template' : 'inv'; context = (base === 'job_templates') ? 'job_template' : 'inv';
// remove "type" field from search options
CredentialList.fields.kind.noSearch = true;
CallbackHelpInit({ scope: $scope }); CallbackHelpInit({ scope: $scope });
$scope.can_edit = true; $scope.can_edit = true;
generator.inject(form, { mode: 'add', related: false, scope: $scope }); generator.inject(form, { mode: 'add', related: false, scope: $scope });
@@ -82,6 +85,7 @@
NetworkCredentialList.iterator = 'networkcredential'; NetworkCredentialList.iterator = 'networkcredential';
NetworkCredentialList.basePath = '/api/v1/credentials?kind=net'; NetworkCredentialList.basePath = '/api/v1/credentials?kind=net';
SurveyControllerInit({ SurveyControllerInit({
scope: $scope, scope: $scope,
parent_scope: $scope parent_scope: $scope

2
awx/ui/client/src/job-templates/edit/job-templates-edit.controller.js
View File

@@ -46,6 +46,8 @@ export default
checkSCMStatus, getPlaybooks, callback, checkSCMStatus, getPlaybooks, callback,
choicesCount = 0; choicesCount = 0;
// remove "type" field from search options
CredentialList.fields.kind.noSearch = true;
CallbackHelpInit({ scope: $scope }); CallbackHelpInit({ scope: $scope });