Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: dani-garcia/vaultwarden
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 980b0d9fb3ee407bccc011fd7b51ddb70d3425cd
Choose a base ref
..
head repository: dani-garcia/vaultwarden
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2fb337d5eb611dc36683312c6c455ec680f6bca7
Choose a head ref
Showing with 13 additions and 12 deletions.
  1. +13 −12 src/api/core/organizations.rs
25 changes: 13 additions & 12 deletions src/api/core/organizations.rs
Original file line number Diff line number Diff line change
@@ -722,18 +722,19 @@ async fn get_org_collection_detail(
.map(|m| (m.uuid, m.atype))
.collect();

let users: Vec<Value> =
CollectionUser::find_by_org_and_coll_swap_user_uuid_with_member_uuid(&org_id, &collection.uuid, &mut conn)
.await
.iter()
.map(|collection_member| {
collection_member.to_json_details_for_member(
*membership_type
.get(&collection_member.membership_uuid)
.unwrap_or(&(MembershipType::User as i32)),
)
})
.collect();
let users: Vec<Value> = CollectionUser::find_by_org_and_coll_swap_user_uuid_with_member_uuid(
&org_id,
&collection.uuid,
&mut conn,
)
.await
.iter()
.map(|collection_member| {
collection_member.to_json_details_for_member(
*membership_type.get(&collection_member.membership_uuid).unwrap_or(&(MembershipType::User as i32)),
)
})
.collect();

let assigned = Collection::can_access_collection(&member, &collection.uuid, &mut conn).await;