From 6156e3c456ba7b34c9b3d6d041a294f4e78a3d4c Mon Sep 17 00:00:00 2001
From: Chris Houseknecht <chouse@ansible.com>
Date: Wed, 30 Jul 2014 16:07:34 -0400
Subject: [PATCH] Credentials Fixed form validation issues when adding a cloud
 credential. The email address field was being required even though it wasn't
 visible.

---
 awx/ui/static/js/controllers/Credentials.js | 1 +
 awx/ui/static/js/forms/Credentials.js       | 4 ++--
 awx/ui/static/js/helpers/Credentials.js     | 7 ++++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/awx/ui/static/js/controllers/Credentials.js b/awx/ui/static/js/controllers/Credentials.js
index 034acbb0a2..d9b7f83019 100644
--- a/awx/ui/static/js/controllers/Credentials.js
+++ b/awx/ui/static/js/controllers/Credentials.js
@@ -225,6 +225,7 @@ function CredentialsAdd($scope, $rootScope, $compile, $location, $log, $routePar
 
     // Reset defaults
     $scope.formReset = function () {
+        //DebugForm({ scope: $scope, form: CredentialForm });
         generator.reset();
     };
 
diff --git a/awx/ui/static/js/forms/Credentials.js b/awx/ui/static/js/forms/Credentials.js
index e275e832ce..6e555aca05 100644
--- a/awx/ui/static/js/forms/Credentials.js
+++ b/awx/ui/static/js/forms/Credentials.js
@@ -140,7 +140,7 @@ angular.module('CredentialFormDefinition', [])
                 ngShow: "kind.value && kind.value !== 'aws' && " +
                         "kind.value !== 'gce' && kind.value!=='azure'",
                 awRequiredWhen: {
-                    variable: 'aws_required',
+                    variable: 'username_required',
                     init: false
                 },
                 autocomplete: false
@@ -150,7 +150,7 @@ angular.module('CredentialFormDefinition', [])
                 type: 'email',
                 ngShow: "kind.value === 'gce'",
                 awRequiredWhen: {
-                    variable: 'username_required',
+                    variable: 'email_required',
                     init: false
                 },
                 autocomplete: false
diff --git a/awx/ui/static/js/helpers/Credentials.js b/awx/ui/static/js/helpers/Credentials.js
index d0677eb82d..b3b16f3f02 100644
--- a/awx/ui/static/js/helpers/Credentials.js
+++ b/awx/ui/static/js/helpers/Credentials.js
@@ -22,10 +22,11 @@ angular.module('CredentialsHelper', ['Utilities'])
             // Put things in a default state
             scope.usernameLabel = 'Username';
             scope.aws_required = false;
+            scope.email_required = false;
             scope.rackspace_required = false;
             scope.sshKeyDataLabel = 'SSH Private Key';
             scope.username_required = false;                        // JT-- added username_required b/c mutliple 'kinds' need username to be required (GCE)
-            scope.key_required = false;                                 // JT -- doing the same for key and project
+            scope.key_required = false;                             // JT -- doing the same for key and project
             scope.project_required = false;
             scope.subscription_required = false;
 
@@ -46,9 +47,9 @@ angular.module('CredentialsHelper', ['Utilities'])
                     scope.sshKeyDataLabel = 'SCM Private Key';
                     break;
                 case 'gce':
-                    scope.usernameLabel = 'Email Address';
+                    scope.usernameLabel = 'Service Account Email Address';
                     scope.sshKeyDataLabel = 'RSA Private Key';
-                    scope.username_required = true;
+                    scope.email_required = true;
                     scope.key_required = true;
                     scope.project_required = true;
                     break;