Browse Source

refactor checkCanCreateRelation

pull/5924/head
desoliture 5 years ago
parent
commit
631348a60c
  1. 3
      application/src/main/java/org/thingsboard/server/controller/EntityRelationController.java

3
application/src/main/java/org/thingsboard/server/controller/EntityRelationController.java

@ -382,7 +382,8 @@ public class EntityRelationController extends BaseController {
private void checkCanCreateRelation(EntityId entityId) throws ThingsboardException { private void checkCanCreateRelation(EntityId entityId) throws ThingsboardException {
SecurityUser currentUser = getCurrentUser(); SecurityUser currentUser = getCurrentUser();
if (!(currentUser.isTenantAdmin() && currentUser.getTenantId().equals(entityId))) { var isTenantAdminAndRelateToSelf = currentUser.isTenantAdmin() && currentUser.getTenantId().equals(entityId);
if (!isTenantAdminAndRelateToSelf) {
checkEntityId(entityId, Operation.WRITE); checkEntityId(entityId, Operation.WRITE);
} }
} }

Loading…
Cancel
Save