diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/registry/WebPermissionDescriptor.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/registry/WebPermissionDescriptor.java index 1d3d32e5bb..22cbd1ba65 100644 --- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/registry/WebPermissionDescriptor.java +++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/registry/WebPermissionDescriptor.java @@ -54,4 +54,9 @@ public class WebPermissionDescriptor { public String getScope() { return cfg.getAttribute("scope"); } + + @Override + public String toString() { + return getScope() + ":" + getId(); + } } diff --git a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/service/security/SMUtils.java b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/service/security/SMUtils.java index e404182ade..fb925fa737 100644 --- a/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/service/security/SMUtils.java +++ b/server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/service/security/SMUtils.java @@ -1,7 +1,6 @@ package io.cloudbeaver.service.security; import io.cloudbeaver.DBWConstants; -import io.cloudbeaver.model.session.WebSession; import io.cloudbeaver.registry.WebPermissionDescriptor; import io.cloudbeaver.registry.WebServiceDescriptor; import io.cloudbeaver.registry.WebServiceRegistry; @@ -9,9 +8,9 @@ import io.cloudbeaver.service.admin.AdminPermissionInfo; import org.jkiss.code.NotNull; import org.jkiss.dbeaver.model.auth.SMCredentialsProvider; import org.jkiss.dbeaver.model.rm.RMConstants; -import org.jkiss.dbeaver.model.security.SMConstants; import java.util.ArrayList; +import java.util.Comparator; import java.util.List; public class SMUtils { @@ -32,6 +31,7 @@ public class SMUtils { } } } + permissionInfos.sort(Comparator.comparing(AdminPermissionInfo::getLabel)); return permissionInfos; } } diff --git a/server/bundles/io.cloudbeaver.service.rm/src/io/cloudbeaver/service/rm/model/RMSubjectProjectPermissions.java b/server/bundles/io.cloudbeaver.service.rm/src/io/cloudbeaver/service/rm/model/RMSubjectProjectPermissions.java index 5b2bd26d9a..fcd355fbb6 100644 --- a/server/bundles/io.cloudbeaver.service.rm/src/io/cloudbeaver/service/rm/model/RMSubjectProjectPermissions.java +++ b/server/bundles/io.cloudbeaver.service.rm/src/io/cloudbeaver/service/rm/model/RMSubjectProjectPermissions.java @@ -1,6 +1,5 @@ package io.cloudbeaver.service.rm.model; -import org.eclipse.passage.lic.internal.json.Json; import org.jkiss.dbeaver.model.data.json.JSONUtils; import java.util.*;