Merge pull request 'B2024-067 Deleting Folders through Admin Tools missing some folders' (#476) from B2024-067 into Development

ready for testing phase
This commit is contained in:
John Jenko 2024-12-05 15:51:32 -05:00
commit 7cc7b71edd

View File

@ -178,6 +178,8 @@ namespace VEPROMS
myDocVersions.Clear();
FolderInfo fi = FolderInfo.GetTop();
fi.RefreshChildFolders();
if (fi.ChildFolderCount > 0)
{
TreeNode tn = new TreeNode(fi.Name);
@ -233,7 +235,7 @@ namespace VEPROMS
loadedWorkingDraft = true;
}
if (tn.Parent != null && !loadedWorkingDraft)
if (tn.Parent != null && !loadedWorkingDraft && fi.FolderDocVersionCount == 0)
{
tn.Remove();
}