preserve none folder filter

This commit is contained in:
Kyle Spearrin 2019-04-30 09:55:28 -04:00
parent 33684bd140
commit e46277c2ac

View file

@ -239,10 +239,10 @@ namespace Bit.App.Pages
else if(FolderId != null) else if(FolderId != null)
{ {
NoDataText = AppResources.NoItemsFolder; NoDataText = AppResources.NoItemsFolder;
FolderId = FolderId == "none" ? null : FolderId; var folderId = FolderId == "none" ? null : FolderId;
if(FolderId != null) if(folderId != null)
{ {
var folderNode = await _folderService.GetNestedAsync(FolderId); var folderNode = await _folderService.GetNestedAsync(folderId);
if(folderNode?.Node != null) if(folderNode?.Node != null)
{ {
PageTitle = folderNode.Node.Name; PageTitle = folderNode.Node.Name;
@ -253,7 +253,7 @@ namespace Bit.App.Pages
{ {
PageTitle = AppResources.FolderNone; PageTitle = AppResources.FolderNone;
} }
Ciphers = _allCiphers.Where(c => c.FolderId == FolderId).ToList(); Ciphers = _allCiphers.Where(c => c.FolderId == folderId).ToList();
} }
else if(CollectionId != null) else if(CollectionId != null)
{ {