From e465186058db013e81c950c3e9cb80580ffe57bc Mon Sep 17 00:00:00 2001
From: Serge Rider <serge@jkiss.org>
Date: Wed, 14 Sep 2022 16:17:40 +0200
Subject: [PATCH] CB-2586 Team service (#1153)

---
 .../src/io/cloudbeaver/registry/WebPermissionDescriptor.java | 5 +++++
 .../io/cloudbeaver/service/admin/impl/WebServiceAdmin.java   | 1 +
 2 files changed, 6 insertions(+)

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.service.admin/src/io/cloudbeaver/service/admin/impl/WebServiceAdmin.java b/server/bundles/io.cloudbeaver.service.admin/src/io/cloudbeaver/service/admin/impl/WebServiceAdmin.java
index 3d69bd720d..bff79552ff 100644
--- a/server/bundles/io.cloudbeaver.service.admin/src/io/cloudbeaver/service/admin/impl/WebServiceAdmin.java
+++ b/server/bundles/io.cloudbeaver.service.admin/src/io/cloudbeaver/service/admin/impl/WebServiceAdmin.java
@@ -126,6 +126,7 @@ public class WebServiceAdmin implements DBWServiceAdmin {
                     }
                 }
             }
+            permissionInfos.sort(Comparator.comparing(AdminPermissionInfo::getLabel));
             return permissionInfos;
         } catch (Exception e) {
             throw new DBWebException("Error reading users", e);