From 07f472381ec76fa01a99c73dd679b4087bb69289 Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Fri, 28 Jul 2017 18:09:21 -0700 Subject: [PATCH] hiding Remdiate Inventory button for non org-admins/admins also found an error in deleting permissions --- awx/ui/client/src/access/permissions-list.controller.js | 2 +- .../inventories/standard-inventory/inventory.form.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/awx/ui/client/src/access/permissions-list.controller.js b/awx/ui/client/src/access/permissions-list.controller.js index 92ed68de9c..f36ee5fa64 100644 --- a/awx/ui/client/src/access/permissions-list.controller.js +++ b/awx/ui/client/src/access/permissions-list.controller.js @@ -20,7 +20,7 @@ export default ['$scope', 'ListDefinition', 'Dataset', 'Wait', 'Rest', 'ProcessE $('#prompt-modal').modal('hide'); Wait('start'); Rest.setUrl(url); - Rest.post({ "disassociate": true, "id": userId }) + Rest.post({ "disassociate": true, "id": Number(userId) }) .success(function() { Wait('stop'); $state.go('.', null, {reload: true}); diff --git a/awx/ui/client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js b/awx/ui/client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js index 6a720ceb31..186e44abf0 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js +++ b/awx/ui/client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js @@ -201,7 +201,7 @@ function(i18n, InventoryCompletedJobsList) { relatedButtons: { remediate_inventory: { ngClick: 'remediateInventory(id, insights_credential)', - ngShow: 'is_insights && mode !== "add"', + ngShow: 'is_insights && mode !== "add" && canEditOrg', label: i18n._('Remediate Inventory'), class: 'Form-primaryButton' }