From c60b8986de7dc879fecd07a368ff9a9ad4e34aa9 Mon Sep 17 00:00:00 2001
From: Leigh Johnson <leigh-johnson@users.noreply.github.com>
Date: Wed, 13 Jul 2016 16:36:21 -0400
Subject: [PATCH] remove type search field from single-type credential lookup
 modals, resolves #2976 (#2985)

---
 awx/ui/client/src/controllers/Projects.js                  | 7 +++++++
 awx/ui/client/src/helpers/JobTemplates.js                  | 2 ++
 .../src/inventories/manage/groups/groups-add.controller.js | 3 +++
 .../inventories/manage/groups/groups-edit.controller.js    | 4 ++++
 .../src/job-templates/add/job-templates-add.controller.js  | 4 ++++
 .../job-templates/edit/job-templates-edit.controller.js    | 2 ++
 6 files changed, 22 insertions(+)

diff --git a/awx/ui/client/src/controllers/Projects.js b/awx/ui/client/src/controllers/Projects.js
index 0fb826906a..4dbb111f79 100644
--- a/awx/ui/client/src/controllers/Projects.js
+++ b/awx/ui/client/src/controllers/Projects.js
@@ -391,6 +391,9 @@ export function ProjectsAdd(Refresh, $scope, $rootScope, $compile, $location, $l
         defaultUrl = GetBasePath('projects'),
         master = {};
 
+    // remove "type" field from search options
+    CredentialList.fields.kind.noSearch = true;
+
     generator.inject(form, { mode: 'add', related: false, scope: $scope });
     generator.reset();
 
@@ -567,6 +570,10 @@ export function ProjectsEdit($scope, $rootScope, $compile, $location, $log,
         id = $stateParams.id,
         relatedSets = {};
 
+    // remove "type" field from search options
+    CredentialList.fields.kind.noSearch = true;
+
+
     SchedulesList.well = false;
     generator.inject(form, {
         mode: 'edit',
diff --git a/awx/ui/client/src/helpers/JobTemplates.js b/awx/ui/client/src/helpers/JobTemplates.js
index 7db3e3cb2e..55b2419390 100644
--- a/awx/ui/client/src/helpers/JobTemplates.js
+++ b/awx/ui/client/src/helpers/JobTemplates.js
@@ -163,6 +163,8 @@ angular.module('JobTemplatesHelper', ['Utilities'])
                                   });
 
                                   CredentialList.basePath = GetBasePath('credentials') + '?kind=ssh';
+                                  // remove "type" field from search options
+                                  CredentialList.fields.kind.noSearch = true;
 
                                   LookUpInit({
                                       url: GetBasePath('credentials') + '?kind=ssh',
diff --git a/awx/ui/client/src/inventories/manage/groups/groups-add.controller.js b/awx/ui/client/src/inventories/manage/groups/groups-add.controller.js
index 179f460d91..a405f2bb52 100644
--- a/awx/ui/client/src/inventories/manage/groups/groups-add.controller.js
+++ b/awx/ui/client/src/inventories/manage/groups/groups-add.controller.js
@@ -12,6 +12,9 @@
         var generator = GenerateForm,
             form = GroupForm();
 
+        // remove "type" field from search options
+        CredentialList.fields.kind.noSearch = true;
+
         $scope.formCancel = function(){
             $state.go('^');
         };
diff --git a/awx/ui/client/src/inventories/manage/groups/groups-edit.controller.js b/awx/ui/client/src/inventories/manage/groups/groups-edit.controller.js
index 4875e3abca..094b53399a 100644
--- a/awx/ui/client/src/inventories/manage/groups/groups-edit.controller.js
+++ b/awx/ui/client/src/inventories/manage/groups/groups-edit.controller.js
@@ -13,6 +13,10 @@
         GroupManageService, GetChoices, GetBasePath, CreateSelect2, GetSourceTypeOptions, groupData, inventorySourceData){
         var generator = GenerateForm,
             form = GroupForm();
+
+        // remove "type" field from search options
+        CredentialList.fields.kind.noSearch = true;
+
         $scope.formCancel = function(){
             $state.go('^');
         };
diff --git a/awx/ui/client/src/job-templates/add/job-templates-add.controller.js b/awx/ui/client/src/job-templates/add/job-templates-add.controller.js
index 7abcf5dfca..f3b957ed99 100644
--- a/awx/ui/client/src/job-templates/add/job-templates-add.controller.js
+++ b/awx/ui/client/src/job-templates/add/job-templates-add.controller.js
@@ -34,6 +34,9 @@
                 base = $location.path().replace(/^\//, '').split('/')[0],
                 context = (base === 'job_templates') ? 'job_template' : 'inv';
 
+            // remove "type" field from search options
+            CredentialList.fields.kind.noSearch = true;
+
             CallbackHelpInit({ scope: $scope });
             $scope.can_edit = true;
             generator.inject(form, { mode: 'add', related: false, scope: $scope });
@@ -82,6 +85,7 @@
             NetworkCredentialList.iterator = 'networkcredential';
             NetworkCredentialList.basePath = '/api/v1/credentials?kind=net';
 
+
             SurveyControllerInit({
                 scope: $scope,
                 parent_scope: $scope
diff --git a/awx/ui/client/src/job-templates/edit/job-templates-edit.controller.js b/awx/ui/client/src/job-templates/edit/job-templates-edit.controller.js
index ff9766ac55..dc02f439b8 100644
--- a/awx/ui/client/src/job-templates/edit/job-templates-edit.controller.js
+++ b/awx/ui/client/src/job-templates/edit/job-templates-edit.controller.js
@@ -46,6 +46,8 @@ export default
                 checkSCMStatus, getPlaybooks, callback,
                 choicesCount = 0;
 
+            // remove "type" field from search options
+            CredentialList.fields.kind.noSearch = true;
 
             CallbackHelpInit({ scope: $scope });