Merge remote-tracking branch 'oqtane/dev' into dev
This commit is contained in:
commit
45f2a47ba5
@ -168,7 +168,21 @@
|
||||
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)
|
||||
{
|
||||
|
Loading…
x
Reference in New Issue
Block a user