From a7a968e0fa455b9afcb480cc2dc7a9622b013f8b Mon Sep 17 00:00:00 2001
From: jaredevantabor <jtabor@ansible.com>
Date: Tue, 7 Feb 2017 17:17:03 -0800
Subject: [PATCH] changing the related tab on an edit of an organization to be
 for users, instead of users & teams

---
 awx/ui/client/src/forms/Organizations.js      | 20 ++++++-------------
 .../src/shared/stateDefinitions.factory.js    |  2 +-
 2 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/awx/ui/client/src/forms/Organizations.js b/awx/ui/client/src/forms/Organizations.js
index cef04b309e..8e67cb20cf 100644
--- a/awx/ui/client/src/forms/Organizations.js
+++ b/awx/ui/client/src/forms/Organizations.js
@@ -53,25 +53,23 @@ export default
             },
 
             related: {
-                permissions: {
-                    name: 'permissions',
-                    awToolTip: i18n._('Please save before assigning permissions'),
+                users: {
+                    dataPlacement: 'top',
+                    awToolTip: i18n._('Please save before adding users'),
                     basePath: 'api/v1/organizations/{{$stateParams.organization_id}}/access_list/',
                     search: {
                         order_by: 'username'
                     },
-                    dataPlacement: 'top',
                     type: 'collection',
-                    title: i18n._('Users & Teams'),
-                    iterator: 'permission',
+                    title: i18n._('Users'),
+                    iterator: 'user',
                     index: false,
                     open: false,
-                    searchType: 'select',
                     actions: {
                         add: {
                             ngClick: "$state.go('.add')",
                             label: i18n._('Add'),
-                            awToolTip: i18n._('Add Users and or Teams to this organization.'),
+                            awToolTip: i18n._('Add Users to this organization.'),
                             actionClass: 'btn List-buttonSubmit',
                             buttonContent: '&#43; ' + i18n._('ADD'),
                             ngShow: '(organization_obj.summary_fields.user_capabilities.edit || canAdd)'
@@ -90,12 +88,6 @@ export default
                             type: 'role',
                             nosort: true,
                             class: 'col-lg-4 col-md-4 col-sm-4 col-xs-4'
-                        },
-                        team_roles: {
-                            label: i18n._('Team Roles'),
-                            type: 'team_roles',
-                            nosort: true,
-                            class: 'col-lg-5 col-md-5 col-sm-5 col-xs-4'
                         }
                     }
                 },
diff --git a/awx/ui/client/src/shared/stateDefinitions.factory.js b/awx/ui/client/src/shared/stateDefinitions.factory.js
index 6a3d61c646..f6f0bf1950 100644
--- a/awx/ui/client/src/shared/stateDefinitions.factory.js
+++ b/awx/ui/client/src/shared/stateDefinitions.factory.js
@@ -548,7 +548,7 @@ export default ['$injector', '$stateExtender', '$log', 'i18n', function($injecto
                         }
                     }
                     else if (field.iterator === 'user' && field.actions && field.actions.add) {
-                        if(form.name === 'team') {
+                        if(form.name === 'team' || form.name === 'organization') {
                             states.push(buildRbacUserDirective());
                         }
                     }