From 938bf1b5315ac102e7ecc3bb6cd2e7ad75de60df Mon Sep 17 00:00:00 2001
From: Jake McDermott <yo@jakemcdermott.me>
Date: Mon, 1 Oct 2018 11:16:35 -0400
Subject: [PATCH 1/2] add organizations tab to team permissions screen

---
 .../src/access/add-rbac-user-team/rbac-user-team.partial.html    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/awx/ui/client/src/access/add-rbac-user-team/rbac-user-team.partial.html b/awx/ui/client/src/access/add-rbac-user-team/rbac-user-team.partial.html
index 276184ec21..177374d366 100644
--- a/awx/ui/client/src/access/add-rbac-user-team/rbac-user-team.partial.html
+++ b/awx/ui/client/src/access/add-rbac-user-team/rbac-user-team.partial.html
@@ -64,7 +64,6 @@
                     <div class="Form-tab"
                         ng-click="selectTab('organizations')"
                         ng-class="{'is-selected': tab.organizations}"
-                        ng-hide="owner.type === 'team'"
                     translate>
                         Organizations
                     </div>

From 78901ab48e79e47fc920be25ade4fbc9c29f3545 Mon Sep 17 00:00:00 2001
From: Jake McDermott <yo@jakemcdermott.me>
Date: Mon, 1 Oct 2018 13:02:18 -0400
Subject: [PATCH 2/2] add organization permissions view

---
 .../src/organizations/organizations.form.js   | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/awx/ui/client/src/organizations/organizations.form.js b/awx/ui/client/src/organizations/organizations.form.js
index 9fbe157783..573042397e 100644
--- a/awx/ui/client/src/organizations/organizations.form.js
+++ b/awx/ui/client/src/organizations/organizations.form.js
@@ -113,6 +113,51 @@ export default ['NotificationsList', 'i18n',
                         }
                     }
                 },
+                permissions: {
+                    name: 'permissions',
+                    awToolTip: i18n._('Please save before assigning permissions.'),
+                    djangoModel: 'access_list',
+                    dataPlacement: 'top',
+                    basePath: 'api/v2/organizations/{{$stateParams.organization_id}}/access_list/',
+                    search: {
+                        order_by: 'username'
+                    },
+                    type: 'collection',
+                    title: i18n._('Permissions'),
+                    iterator: 'permission',
+                    index: false,
+                    open: false,
+                    actions: {
+                        add: {
+                            ngClick: "$state.go('.add')",
+                            label: 'Add',
+                            awToolTip: i18n._('Add a permission'),
+                            actionClass: 'at-Button--add',
+                            actionId: 'button-add',
+                            ngShow: '(organization_obj.summary_fields.user_capabilities.edit || canAdd)'
+                        }
+                    },
+                    fields: {
+                        username: {
+                            key: true,
+                            label: i18n._('User'),
+                            linkBase: 'users',
+                            class: 'col-lg-3 col-md-3 col-sm-3 col-xs-4'
+                        },
+                        role: {
+                            label: i18n._('Role'),
+                            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',
+                        }
+                    }
+                },
                 "notifications": {
                     include: "NotificationsList"