Merge pull request #7161 from jlmitch5/credTypeSelectUpdates

only show cloud and network in select for custom cred types

awx/ui/client/src/credential-types/add/add.controller.js

@@ -17,6 +17,14 @@ export default ['Rest', 'Wait',
         init();
 
         function init() {
+
+            // for add, don't show ssh
+            $scope.$on('loadCredentialKindOptions', function() {
+                $scope.credential_kind_options = $scope.credential_kind_options
+                        .filter(val => val.value === 'net' ||
+                            val.value === 'cloud');
+            });
+
             // Load the list of options for Kind
             $scope.$parent.optionsDefer.promise
                 .then(function(options) {
@@ -25,7 +33,8 @@ export default ['Rest', 'Wait',
                         url: url,
                         field: 'kind',
                         variable: 'credential_kind_options',
-                        options: options
+                        options: options,
+                        callback: 'loadCredentialKindOptions'
                     });
 
                     if (!options.actions.POST) {

awx/ui/client/src/credential-types/edit/edit.controller.js

@@ -43,6 +43,11 @@ export default ['Rest', 'Wait',
         }
         $scope.removeChoicesReady = $scope.$on('choicesReadyCredentialTypes',
             function() {
+                if (!resourceData.data.managed_by_tower) {
+                    $scope.credential_kind_options = $scope.credential_kind_options
+                            .filter(val => val.value === 'net' ||
+                                val.value === 'cloud');
+                }
 
                 $scope.credential_type = credential_typeData;