From e75f1890e15c5e6f6b6551b72d53e472aed3ecd4 Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Fri, 9 Oct 2015 17:47:42 -0400 Subject: [PATCH] conditionally require cloud credential --- awx/ui/client/src/forms/Source.js | 6 ++++-- awx/ui/client/src/helpers/Groups.js | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/awx/ui/client/src/forms/Source.js b/awx/ui/client/src/forms/Source.js index 0246f39cab..9feb8e7f28 100644 --- a/awx/ui/client/src/forms/Source.js +++ b/awx/ui/client/src/forms/Source.js @@ -46,8 +46,10 @@ export default sourceModel: 'credential', sourceField: 'name', ngClick: 'lookUpCredential()', - addRequired: false, - editRequired: false + awRequiredWhen: { + variable: "cloudCredentialRequired", + init: "false" + } }, source_regions: { label: 'Regions', diff --git a/awx/ui/client/src/helpers/Groups.js b/awx/ui/client/src/helpers/Groups.js index 55e444fbcc..770c848a18 100644 --- a/awx/ui/client/src/helpers/Groups.js +++ b/awx/ui/client/src/helpers/Groups.js @@ -47,6 +47,7 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', listGenerator.name }); } } + scope.cloudCredentialRequired = false; scope.$emit('sourceTypeOptionsReady'); }) .error(function (data, status) { @@ -243,6 +244,8 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', listGenerator.name form = params.form, kind, url, callback, invUrl; + scope.cloudCredentialRequired = false; + if (!Empty(scope.source)) { if (scope.source.value === 'file') { scope.sourcePathRequired = true; @@ -313,6 +316,7 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', listGenerator.name kind = 'aws'; } else { kind = scope.source.value; + scope.cloudCredentialRequired = true; } url = GetBasePath('credentials') + '?cloud=true&kind=' + kind; LookUpInit({