Skip to content

Commit 1f868b8

Browse files
authored
Show assigned collections on member edit (#5556)
Because we were using the `has_full_access()` function we did not returned assigned collections for an owner/admin even if the did not have the `access_all` flag set. This commit will change that to use the `access_all` flag instead, and return assigned collections too. While saving a member and having it assigned collections would still save those rights, and it was also visible in the collection management, it wasn't at the member it self. So, it did work, but was not visible. Fixes #5554 Fixes #5555 Signed-off-by: BlackDex <black.dex@gmail.com>
1 parent 8d1df08 commit 1f868b8

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/db/models/organization.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ impl Membership {
517517
CONFIG.org_groups_enabled() && Group::is_in_full_access_group(&self.user_uuid, &self.org_uuid, conn).await;
518518

519519
// If collections are to be included, only include them if the user does not have full access via a group or defined to the user it self
520-
let collections: Vec<Value> = if include_collections && !(full_access_group || self.has_full_access()) {
520+
let collections: Vec<Value> = if include_collections && !(full_access_group || self.access_all) {
521521
// Get all collections for the user here already to prevent more queries
522522
let cu: HashMap<CollectionId, CollectionUser> =
523523
CollectionUser::find_by_organization_and_user_uuid(&self.org_uuid, &self.user_uuid, conn)

0 commit comments

Comments
 (0)