From 8b8aad65911ac92be90ec521f39bc1c76a4e4769 Mon Sep 17 00:00:00 2001 From: Michael Barz Date: Mon, 9 Sep 2024 16:23:30 +0200 Subject: [PATCH] fix: improve some wordings and cli table --- .../6.4.0_2024-09-12/enhancement-unified-roles-management.md | 1 + services/graph/pkg/command/unified_roles.go | 2 +- services/graph/pkg/unifiedrole/roles.go | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/changelog/6.4.0_2024-09-12/enhancement-unified-roles-management.md b/changelog/6.4.0_2024-09-12/enhancement-unified-roles-management.md index 6ecf95fb2c..0f885e0052 100644 --- a/changelog/6.4.0_2024-09-12/enhancement-unified-roles-management.md +++ b/changelog/6.4.0_2024-09-12/enhancement-unified-roles-management.md @@ -37,5 +37,6 @@ The output of this command includes the following information for each role: - Description: A short description of the role. - Enabled: Whether the role is enabled or not. +https://github.com/owncloud/ocis/pull/10013 https://github.com/owncloud/ocis/pull/9727 https://github.com/owncloud/ocis/issues/9698 diff --git a/services/graph/pkg/command/unified_roles.go b/services/graph/pkg/command/unified_roles.go index bd901b3ac5..b9e875a680 100644 --- a/services/graph/pkg/command/unified_roles.go +++ b/services/graph/pkg/command/unified_roles.go @@ -62,7 +62,7 @@ func listUnifiedRoles(cfg *config.Config) *cli.Command { case 0: rows[0] = append(rows[0], row...) default: - rows = append(rows, append(slices.Clone(rows[0][:len(rows[0])-len(row)]), row...)) + rows[0][3] = rows[0][3] + "\n" + rolePermission.GetCondition() } } diff --git a/services/graph/pkg/unifiedrole/roles.go b/services/graph/pkg/unifiedrole/roles.go index 12cf070473..2b24100b31 100644 --- a/services/graph/pkg/unifiedrole/roles.go +++ b/services/graph/pkg/unifiedrole/roles.go @@ -120,7 +120,7 @@ var ( _editorListGrantsUnifiedRoleDisplayName = l10n.Template("Can edit") // UnifiedRole SpaseEditor, Role Description (resolves directly) - _spaceEditorUnifiedRoleDescription = l10n.Template("View, download, upload, edit, add and delete.") + _spaceEditorUnifiedRoleDescription = l10n.Template("View, download, upload, edit, add, delete including the history.") // UnifiedRole SpaseEditor, Role DisplayName (resolves directly) _spaceEditorUnifiedRoleDisplayName = l10n.Template("Can edit")