From 94ea3cfcfeec1ecc7aa90becfad8800265970f0e Mon Sep 17 00:00:00 2001
From: Leigh Johnson <ljohnson@redhat.com>
Date: Sat, 26 Nov 2016 16:11:24 -0500
Subject: [PATCH] Update User/Team form config

---
 awx/ui/client/src/forms/Teams.js |  2 +-
 awx/ui/client/src/forms/Users.js | 19 +++++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/awx/ui/client/src/forms/Teams.js b/awx/ui/client/src/forms/Teams.js
index 6e50a55cf9..639a4b2a00 100644
--- a/awx/ui/client/src/forms/Teams.js
+++ b/awx/ui/client/src/forms/Teams.js
@@ -115,7 +115,7 @@ export default
                         order_by: 'id'
                     },
                     type: 'collection',
-                    title: i18n._('Granted Permissions'),
+                    title: i18n._('Permissions'),
                     iterator: 'role',
                     open: false,
                     index: false,
diff --git a/awx/ui/client/src/forms/Users.js b/awx/ui/client/src/forms/Users.js
index 20f8126a83..007bfc438c 100644
--- a/awx/ui/client/src/forms/Users.js
+++ b/awx/ui/client/src/forms/Users.js
@@ -173,14 +173,13 @@ export default
                     basePath: 'api/v1/users/{{$stateParams.user_id}}/roles/',
                     search: {
                         page_size: '10',
-                        // @todo ask about name field / serializer on this endpoint
                         order_by: 'id'
                     },
                     awToolTip: i18n._('Please save before assigning to organizations'),
                     dataPlacement: 'top',
                     hideSearchAndActions: true,
                     type: 'collection',
-                    title: i18n._('Granted permissions'),
+                    title: i18n._('Permissions'),
                     iterator: 'permission',
                     open: false,
                     index: false,
@@ -203,12 +202,16 @@ export default
                             noSort: true
                         },
                     },
-                    // @issue https://github.com/ansible/ansible-tower/issues/3487
-                    // actions: {
-                    //     add: {
-
-                    //     }
-                    // }
+                    actions: {
+                        add: {
+                            ngClick: "$state.go('.add')",
+                            label: 'Add',
+                            awToolTip: i18n._('Grant Permission'),
+                            actionClass: 'btn List-buttonSubmit',
+                            buttonContent: '&#43; ' + i18n._('ADD PERMISSIONS'),
+                            ngShow: '(puser_obj.summary_fields.user_capabilities.edit || canAdd)'
+                        }
+                    },
                     fieldActions: {
                         "delete": {
                             label: i18n._('Remove'),