From 016191f3d9f67b2e5bb688d99df19743d72ad4e3 Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Tue, 4 Aug 2020 15:10:05 +0300 Subject: [PATCH] Fix permission check for saveEntityView --- .../org/thingsboard/server/controller/EntityViewController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/src/main/java/org/thingsboard/server/controller/EntityViewController.java b/application/src/main/java/org/thingsboard/server/controller/EntityViewController.java index 3590a10c86..788d8dcc37 100644 --- a/application/src/main/java/org/thingsboard/server/controller/EntityViewController.java +++ b/application/src/main/java/org/thingsboard/server/controller/EntityViewController.java @@ -116,7 +116,7 @@ public class EntityViewController extends BaseController { accessControlService .checkPermission(getCurrentUser(), Resource.ENTITY_VIEW, Operation.CREATE, null, entityView); } else { - EntityView existingEntityView = checkNotNull(entityViewService.findEntityViewById(getCurrentUser().getTenantId(), entityView.getId())); + EntityView existingEntityView = checkEntityViewId(entityView.getId(), Operation.READ); if (existingEntityView.getKeys() != null) { if (existingEntityView.getKeys().getAttributes() != null) { futures.add(deleteAttributesFromEntityView(existingEntityView, DataConstants.CLIENT_SCOPE, existingEntityView.getKeys().getAttributes().getCs(), getCurrentUser()));