diff --git a/PROMS/VEPROMS User Interface/dlgManageSecurity.cs b/PROMS/VEPROMS User Interface/dlgManageSecurity.cs index 45e2e4f7..4ce67797 100644 --- a/PROMS/VEPROMS User Interface/dlgManageSecurity.cs +++ b/PROMS/VEPROMS User Interface/dlgManageSecurity.cs @@ -99,7 +99,7 @@ namespace VEPROMS } if (fi.ChildFolderCount > 0) { - foreach (FolderInfo fic in fi.ChildFolders) + foreach (FolderInfo fic in fi.SortedChildFolders) { LoadChildFolders(fic, tn); } diff --git a/PROMS/VEPROMS User Interface/frmBatchRefresh.cs b/PROMS/VEPROMS User Interface/frmBatchRefresh.cs index cc314676..4f903f62 100644 --- a/PROMS/VEPROMS User Interface/frmBatchRefresh.cs +++ b/PROMS/VEPROMS User Interface/frmBatchRefresh.cs @@ -135,7 +135,7 @@ namespace VEPROMS } private void LoadChildFolders(FolderInfo fi, TreeNode tn, bool noProcs) { - foreach (FolderInfo fic in fi.ChildFolders) + foreach (FolderInfo fic in fi.SortedChildFolders) { TreeNode tnc = tn.Nodes.Add(fic.Name); tnc.Tag = fic; @@ -195,7 +195,7 @@ namespace VEPROMS TreeNode tn = myTV.Nodes.Add(f.Name); tn.Tag = f; if (f.ChildFolderCount > 0) - foreach (FolderInfo cf in f.ChildFolders) + foreach (FolderInfo cf in f.SortedChildFolders) LoadFolderInfo(cf); } private void UpdateROValues() diff --git a/PROMS/Volian.Controls.Library/DisplayReports.cs b/PROMS/Volian.Controls.Library/DisplayReports.cs index 1925137d..5572429b 100644 --- a/PROMS/Volian.Controls.Library/DisplayReports.cs +++ b/PROMS/Volian.Controls.Library/DisplayReports.cs @@ -419,7 +419,7 @@ namespace Volian.Controls.Library //advTreeProcSets.AfterNodeInsert += new TreeNodeCollectionEventHandler(advTreeProcSets_AfterNodeInsert); - foreach (FolderInfo fic in fi.ChildFolders) + foreach (FolderInfo fic in fi.SortedChildFolders) { DevComponents.AdvTree.Node newnode = new DevComponents.AdvTree.Node(); newnode.Text = fic.ToString(); @@ -487,7 +487,7 @@ namespace Volian.Controls.Library FolderInfo fi = (FolderInfo)obj; if (fi.ChildFolderCount > 0) { - foreach (FolderInfo fic in fi.ChildFolders) + foreach (FolderInfo fic in fi.SortedChildFolders) { DevComponents.AdvTree.Node newnode = new DevComponents.AdvTree.Node(); newnode.Text = fic.ToString(); diff --git a/PROMS/Volian.Controls.Library/DisplaySearch.cs b/PROMS/Volian.Controls.Library/DisplaySearch.cs index 44828a5e..dc19a955 100644 --- a/PROMS/Volian.Controls.Library/DisplaySearch.cs +++ b/PROMS/Volian.Controls.Library/DisplaySearch.cs @@ -457,9 +457,9 @@ namespace Volian.Controls.Library advTreeProcSets.Nodes.Add(topnode); //advTreeProcSets.AfterNodeInsert += new TreeNodeCollectionEventHandler(advTreeProcSets_AfterNodeInsert); - if (fi.ChildFolders != null) + if (fi.SortedChildFolders != null) { - foreach (FolderInfo fic in fi.ChildFolders) + foreach (FolderInfo fic in fi.SortedChildFolders) { DevComponents.AdvTree.Node newnode = new DevComponents.AdvTree.Node(); newnode.Text = fic.ToString(); @@ -558,7 +558,7 @@ namespace Volian.Controls.Library FolderInfo fi = (FolderInfo)obj; if (fi.ChildFolderCount > 0) { - foreach (FolderInfo fic in fi.ChildFolders) + foreach (FolderInfo fic in fi.SortedChildFolders) { DevComponents.AdvTree.Node newnode = new DevComponents.AdvTree.Node(); newnode.Text = fic.ToString(); diff --git a/PROMS/Volian.Controls.Library/DisplayTransition.cs b/PROMS/Volian.Controls.Library/DisplayTransition.cs index db39d462..c7721014 100644 --- a/PROMS/Volian.Controls.Library/DisplayTransition.cs +++ b/PROMS/Volian.Controls.Library/DisplayTransition.cs @@ -380,7 +380,7 @@ namespace Volian.Controls.Library { int indx = -1; int pathid = filist[filist.Count - 1].FolderID; - foreach (FolderInfo fic in fi.ChildFolders) + foreach (FolderInfo fic in fi.SortedChildFolders) { DropDownNode newnode = new DropDownNode(fic.FolderID, fic.ToString()); int tmp = topnode==null?vlnTreeComboSets.DropDownControl.Nodes.Add(newnode):topnode.Nodes.Add(newnode); @@ -680,7 +680,7 @@ namespace Volian.Controls.Library FolderInfo fi = (FolderInfo)obj; if (fi.ChildFolderCount > 0) { - foreach (FolderInfo fic in fi.ChildFolders) + foreach (FolderInfo fic in fi.SortedChildFolders) { DropDownNode newnode = new DropDownNode(fic.FolderID, fic.ToString()); par.Nodes.Add(newnode);