Merge pull request #5071 from bastianbeier/fix/role-conversion

2403905 · web-flow · commit 2a7145a1d4ad · 2025-02-05T15:49:57.000+01:00
Fix role conversion
diff --git a/changelog/unreleased/fix-role-conversion.md b/changelog/unreleased/fix-role-conversion.md
@@ -0,0 +1,5 @@
+Bugfix: Role conversion
+
+Fix role from resource permission conversion
+
+https://github.com/cs3org/reva/pull/5071
diff --git a/pkg/conversions/role.go b/pkg/conversions/role.go
@@ -617,7 +617,7 @@ func RoleFromResourcePermissions(rp *provider.ResourcePermissions, islink bool)
 			if rp.ListGrants {
 				r.Name = RoleEditorListGrants
 			}
-			if rp.RemoveGrant && rp.ListFileVersions {
+			if rp.ListGrants && rp.ListFileVersions {
 				r.Name = RoleEditorListGrantsWithVersions
 			}
 			if rp.RemoveGrant {

Original file line number	Diff line number	Diff line change
`@@ -617,7 +617,7 @@ func RoleFromResourcePermissions(rp *provider.ResourcePermissions, islink bool)`
`617`	`617`	`if rp.ListGrants {`
`618`	`618`	`r.Name = RoleEditorListGrants`
`619`	`619`	`}`
`620`		`- if rp.RemoveGrant && rp.ListFileVersions {`
	`620`	`+ if rp.ListGrants && rp.ListFileVersions {`
`621`	`621`	`r.Name = RoleEditorListGrantsWithVersions`
`622`	`622`	`}`
`623`	`623`	`if rp.RemoveGrant {`