vw_small

Hardened fork of Vaultwarden (https://github.com/dani-garcia/vaultwarden) with fewer features.
git clone https://git.philomathiclife.com/repos/vw_small
Log | Files | Refs | README

commit 317aa679cfda0c942369df5ab1ff3fa356bbee8b
parent d139e2204255fe8faedcb413f9c77e423de38f4c
Author: Daniel GarcĂ­a <dani-garcia@users.noreply.github.com>
Date:   Mon, 12 Dec 2022 22:56:32 +0100

Merge branch 'BlackDex-issue-2975'

Diffstat:
Msrc/db/models/collection.rs | 12++++++------
1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/db/models/collection.rs b/src/db/models/collection.rs @@ -167,15 +167,15 @@ impl Collection { users_collections::user_uuid.eq(user_uuid.clone()) ) )) - .inner_join(users_organizations::table.on( + .left_join(users_organizations::table.on( collections::org_uuid.eq(users_organizations::org_uuid).and( users_organizations::user_uuid.eq(user_uuid.clone()) ) )) - .inner_join(groups_users::table.on( + .left_join(groups_users::table.on( groups_users::users_organizations_uuid.eq(users_organizations::uuid) )) - .inner_join(groups::table.on( + .left_join(groups::table.on( groups::uuid.eq(groups_users::groups_uuid) )) .left_join(collections_groups::table.on( @@ -252,15 +252,15 @@ impl Collection { users_collections::user_uuid.eq(user_uuid.clone()) ) )) - .inner_join(users_organizations::table.on( + .left_join(users_organizations::table.on( collections::org_uuid.eq(users_organizations::org_uuid).and( users_organizations::user_uuid.eq(user_uuid) ) )) - .inner_join(groups_users::table.on( + .left_join(groups_users::table.on( groups_users::users_organizations_uuid.eq(users_organizations::uuid) )) - .inner_join(groups::table.on( + .left_join(groups::table.on( groups::uuid.eq(groups_users::groups_uuid) )) .left_join(collections_groups::table.on(