Merge remote-tracking branch 'oqtane/dev' into dev

This commit is contained in:
Leigh Pointer
2023-07-19 21:53:10 +02:00

View File

@ -168,7 +168,21 @@
ShowSuccess = true; ShowSuccess = true;
} }
_folders = await FolderService.GetFoldersAsync(ModuleState.SiteId); if (ShowFolders)
{
_folders = await FolderService.GetFoldersAsync(ModuleState.SiteId);
}
else
{
if (FolderId != -1)
{
var folder = await FolderService.GetFolderAsync(FolderId);
if (folder != null)
{
_folders = new List<Folder> { folder };
}
}
}
if (!string.IsNullOrEmpty(Folder) && Folder != Constants.PackagesFolder) if (!string.IsNullOrEmpty(Folder) && Folder != Constants.PackagesFolder)
{ {