External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-13 23:17:32 -02:30
Code Issues Packages Projects Releases Wiki Activity

hiding Remdiate Inventory button for non org-admins/admins

Browse Source 
also found an error in deleting permissions
This commit is contained in:
Jared Tabor
2017-07-28 18:09:21 -07:00
parent 9ab141753c
commit 07f472381e
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/client/src/access/permissions-list.controller.js
View File

@@ -20,7 +20,7 @@ export default ['$scope', 'ListDefinition', 'Dataset', 'Wait', 'Rest', 'ProcessE
$('#prompt-modal').modal('hide'); $('#prompt-modal').modal('hide');
Wait('start'); Wait('start');
Rest.setUrl(url); Rest.setUrl(url);
Rest.post({ "disassociate": true, "id": userId }) Rest.post({ "disassociate": true, "id": Number(userId) })
.success(function() { .success(function() {
Wait('stop'); Wait('stop');
$state.go('.', null, {reload: true}); $state.go('.', null, {reload: true});

2
awx/ui/client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js
View File

@@ -201,7 +201,7 @@ function(i18n, InventoryCompletedJobsList) {
relatedButtons: { relatedButtons: {
remediate_inventory: { remediate_inventory: {
ngClick: 'remediateInventory(id, insights_credential)', ngClick: 'remediateInventory(id, insights_credential)',
ngShow: 'is_insights && mode !== "add"', ngShow: 'is_insights && mode !== "add" && canEditOrg',
label: i18n._('Remediate Inventory'), label: i18n._('Remediate Inventory'),
class: 'Form-primaryButton' class: 'Form-primaryButton'
} }