mirror of
https://github.com/bitwarden/browser
synced 2025-01-30 13:05:28 +01:00
Show folders and properly filter collections (#2688)
This commit is contained in:
parent
b11e13007c
commit
fae7fd9378
@ -115,7 +115,7 @@ export class CiphersComponent extends BaseCiphersComponent implements OnInit, On
|
||||
}
|
||||
await this.load(this.buildFilter());
|
||||
} else if (params.folderId) {
|
||||
this.showVaultFilter = false;
|
||||
this.showVaultFilter = true;
|
||||
this.folderId = params.folderId === "none" ? null : params.folderId;
|
||||
this.searchPlaceholder = this.i18nService.t("searchFolder");
|
||||
if (this.folderId != null) {
|
||||
|
@ -115,7 +115,7 @@
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="box list" *ngIf="!selectedOrganization && nestedFolders?.length">
|
||||
<div class="box list" *ngIf="nestedFolders?.length">
|
||||
<h2 class="box-header">
|
||||
{{ "folders" | i18n }}
|
||||
<span class="flex-right">{{ folderCount }}</span>
|
||||
|
@ -174,7 +174,9 @@ export class VaultFilterComponent implements OnInit, OnDestroy {
|
||||
}
|
||||
|
||||
async loadCollections() {
|
||||
const allCollections = await this.vaultFilterService.buildCollections();
|
||||
const allCollections = await this.vaultFilterService.buildCollections(
|
||||
this.selectedOrganization
|
||||
);
|
||||
this.collections = allCollections.fullList;
|
||||
this.nestedCollections = allCollections.nestedList;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user