From 7658cdb8b493401ea7d3149eeae2b65e943a14da Mon Sep 17 00:00:00 2001 From: yagudin10 Date: Wed, 3 Aug 2022 17:05:04 +0300 Subject: [PATCH] CB-2311 navigator node features fix --- .../service/navigator/WebNavigatorNodeInfo.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/WebNavigatorNodeInfo.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/WebNavigatorNodeInfo.java index 7a82b9d9dc..5afb3bb4ea 100644 --- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/WebNavigatorNodeInfo.java +++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/WebNavigatorNodeInfo.java @@ -166,13 +166,6 @@ public class WebNavigatorNodeInfo { if (isShared) { features.add(NODE_FEATURE_SHARED); } - if (node instanceof DBNRoot) { - return features.toArray(new String[0]); - } - VirtualProjectImpl project = session.getProjectById(node.getOwnerProject().getId()); - if (!project.getRmProject().getProjectPermissions().contains(RMProjectPermission.CONNECTIONS_EDIT.getPermissionId())) { - return features.toArray(new String[0]); - } if (node instanceof DBNDatabaseNode) { DBSObject object = ((DBNDatabaseNode) node).getObject(); if (object != null) { @@ -187,7 +180,15 @@ public class WebNavigatorNodeInfo { } } } - } else if (node instanceof DBNLocalFolder || node instanceof DBNResourceManagerResource) { + } + if (node instanceof DBNRoot) { + return features.toArray(new String[0]); + } + VirtualProjectImpl project = session.getProjectById(node.getOwnerProject().getId()); + if (!project.getRmProject().getProjectPermissions().contains(RMProjectPermission.CONNECTIONS_EDIT.getPermissionId())) { + return features.toArray(new String[0]); + } + if (node instanceof DBNLocalFolder || node instanceof DBNResourceManagerResource) { features.add(NODE_FEATURE_CAN_RENAME); features.add(NODE_FEATURE_CAN_DELETE); }