diff options
| author | Daniel García <[email protected]> | 2022-12-12 22:56:32 +0100 |
|---|---|---|
| committer | Daniel García <[email protected]> | 2022-12-12 22:56:32 +0100 |
| commit | 317aa679cfda0c942369df5ab1ff3fa356bbee8b (patch) | |
| tree | e5737885d813b1f65d23de3b5ade310b68504895 | |
| parent | d139e2204255fe8faedcb413f9c77e423de38f4c (diff) | |
| parent | 8d1bc2e5397bc9b0d1f5be14baafa802b7156e91 (diff) | |
| download | vaultwarden-317aa679cfda0c942369df5ab1ff3fa356bbee8b.tar.gz vaultwarden-317aa679cfda0c942369df5ab1ff3fa356bbee8b.zip | |
Merge branch 'BlackDex-issue-2975'
| -rw-r--r-- | src/db/models/collection.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/db/models/collection.rs b/src/db/models/collection.rs index 14eef617..eba0ffee 100644 --- 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( |