From 297be96b80a92ab317f295b97fd1ab24a70c1ea8 Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Mon, 12 Sep 2016 12:19:04 -0400 Subject: [PATCH] added unattach user_capabilities to granted permissions list --- awx/ui/client/src/forms/Teams.js | 3 ++- awx/ui/client/src/forms/Users.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/awx/ui/client/src/forms/Teams.js b/awx/ui/client/src/forms/Teams.js index 834cd099df..86e0315a71 100644 --- a/awx/ui/client/src/forms/Teams.js +++ b/awx/ui/client/src/forms/Teams.js @@ -142,7 +142,8 @@ export default 'class': "List-actionButton--delete", iconClass: 'fa fa-times', awToolTip: 'Dissasociate permission from team', - dataPlacement: 'top' + dataPlacement: 'top', + ngShow: 'permission.summary_fields.user_capabilities.unattach' } }, hideOnSuperuser: true diff --git a/awx/ui/client/src/forms/Users.js b/awx/ui/client/src/forms/Users.js index 033360f8c1..aeae66e873 100644 --- a/awx/ui/client/src/forms/Users.js +++ b/awx/ui/client/src/forms/Users.js @@ -201,7 +201,7 @@ export default ngClick: 'deletePermissionFromUser(user_id, username, permission.name, permission.summary_fields.resource_name, permission.related.users)', iconClass: 'fa fa-times', awToolTip: 'Dissasociate permission from user', - ngShow: 'canEdit' + ngShow: 'permission.summary_fields.user_capabilities.unattach' } }, hideOnSuperuser: true