Fixed NextItems logic

Replaced duplicate logic in GetChildren with MyItems
Fixed logic to check for Sections = null
This commit is contained in:
Rich
2010-11-15 17:01:36 +00:00
parent ba85df568a
commit e20796dfbf
6 changed files with 12 additions and 9 deletions

View File

@@ -725,7 +725,7 @@ namespace VEPROMS.CSLA.Library
{
get
{
if (NextItemCount > 0 && NextItems.Count > 0)
if (NextItemCount > 0 && NextItems != null && NextItems.Count > 0)
return NextItems[0];
return null;
}

View File

@@ -111,7 +111,8 @@ namespace VEPROMS.CSLA.Library
{ get { return (_MyItems != null ? _MyItems : _MyItems = ItemInfoList.GetList(_ItemID, _FromType)); } }
public System.Collections.IList GetChildren()
{
return (_MyItems != null ? _MyItems : _MyItems = ItemInfoList.GetList(_ItemID, _FromType));
//return (_MyItems != null ? _MyItems : _MyItems = ItemInfoList.GetList(_ItemID, _FromType));
return MyItems;
}
//public bool ChildrenAreLoaded
//{

View File

@@ -630,6 +630,8 @@ namespace VEPROMS.CSLA.Library
int cntsect = 0;
ItemInfo sect = TranGetSectionItem(tb._ToItem);
if (tb._ToItem.MyProcedure.Sections == null)
tb._ToItem.MyProcedure.MyContent.RefreshContentParts();
foreach (ItemInfo ii in tb._ToItem.MyProcedure.Sections) if (ii.IsStepSection) cntsect++;
// If Procedure going to has only 1 step section, do not add it.
if (cntsect == 1) return false; // tb.TextAdded;