bitwarden/jslib
1
0
Fork 0
mirror of https://github.com/bitwarden/jslib synced 2025-12-15 15:53:51 +00:00
Code Issues Releases Wiki Activity

Add null check

Browse Source
This commit is contained in:
Thomas Rittson
2022-05-20 15:29:12 +10:00
parent c3756319d6
commit 0b338fbef5
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
angular/src/modules/vault-filter/vault-filter.service.ts
View File

@@ -64,9 +64,10 @@ export class VaultFilterService {
} }
async buildCollections(vaultFilter: VaultFilter): Promise<DynamicTreeNode<CollectionView>> { async buildCollections(vaultFilter: VaultFilter): Promise<DynamicTreeNode<CollectionView>> {
const collections = vaultFilter.useAdminCollections const collections =
? await this.getAdminCollections(vaultFilter.selectedOrganizationId) vaultFilter.useAdminCollections && vaultFilter.selectedOrganizationId != null
: await this.getUserCollections(vaultFilter.selectedOrganizationId); ? await this.getAdminCollections(vaultFilter.selectedOrganizationId)
: await this.getUserCollections(vaultFilter.selectedOrganizationId);
const nestedCollections = await this.collectionService.getAllNested(collections); const nestedCollections = await this.collectionService.getAllNested(collections);
return new DynamicTreeNode<CollectionView>({ return new DynamicTreeNode<CollectionView>({