diff --git a/apps/assets/api/node.py b/apps/assets/api/node.py index 9a60c636f..47ac0b4e6 100644 --- a/apps/assets/api/node.py +++ b/apps/assets/api/node.py @@ -103,7 +103,7 @@ class NodeAddAssetsApi(generics.UpdateAPIView): instance = None permission_classes = (RBACPermission,) rbac_perms = { - 'PUT': 'assets.change_assettonode', + 'PUT': 'assets.change_assetnodes', } def perform_update(self, serializer): @@ -118,7 +118,7 @@ class NodeRemoveAssetsApi(generics.UpdateAPIView): instance = None permission_classes = (RBACPermission,) rbac_perms = { - 'PUT': 'assets.change_assetfromnode', + 'PUT': 'assets.change_assetnodes', } def perform_update(self, serializer): @@ -140,7 +140,7 @@ class MoveAssetsToNodeApi(generics.UpdateAPIView): instance = None permission_classes = (RBACPermission,) rbac_perms = { - 'PUT': 'assets.change_assettonode', + 'PUT': 'assets.change_assetnodes', } def perform_update(self, serializer): diff --git a/apps/rbac/const.py b/apps/rbac/const.py index a70e87db8..1c0f594f9 100644 --- a/apps/rbac/const.py +++ b/apps/rbac/const.py @@ -51,6 +51,8 @@ exclude_permissions = ( ('assets', 'commandfilterrule', '*', '*'), ('assets', 'asset', 'add,move', 'assettonode'), ('assets', 'asset', 'remove', 'assetfromnode'), + ('assets', 'asset', 'test', 'account'), + ('assets', 'asset', 'push', 'assetaccount'), ('accounts', 'historicalaccount', '*', '*'), ('accounts', 'accountbaseautomation', '*', '*'), diff --git a/apps/rbac/migrations/0011_remove_redundant_permission.py b/apps/rbac/migrations/0011_remove_redundant_permission.py index d8a874f19..6febd432c 100644 --- a/apps/rbac/migrations/0011_remove_redundant_permission.py +++ b/apps/rbac/migrations/0011_remove_redundant_permission.py @@ -18,7 +18,8 @@ def migrate_remove_redundant_permission(apps, *args): model.objects.filter(app_label='assets', model__in=[ 'authbook', 'historicalauthbook', 'test_gateway', - 'accountbackupplan', 'accountbackupplanexecution', 'gathereduser', 'systemuser' + 'accountbackupplan', 'accountbackupplanexecution', + 'gathereduser', 'systemuser' ]).delete() model.objects.filter(app_label='perms', model__in=[ @@ -28,6 +29,7 @@ def migrate_remove_redundant_permission(apps, *args): perm_model = apps.get_model('auth', 'Permission') perm_model.objects.filter(codename__in=[ 'view_permusergroupasset', 'view_permuserasset', 'push_assetsystemuser', + 'add_assettonode', 'move_assettonode', 'remove_assetfromnode', ]).delete()