Volian/SourceCode
8
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Browse Source
This commit is contained in:
Kathy Ruffing 2012-09-27 11:05:07 +00:00
parent a9267ec40e
commit 31fb66002a
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PROMS/VEPROMS.CSLA.Library/Config/ProcConfig.cs
View File

@ -56,9 +56,9 @@ namespace VEPROMS.CSLA.Library
if (args.AncestorLookup || ParentLookup) if (args.AncestorLookup || ParentLookup)
{ {
string retval; string retval;
//ProcedureInfo proc = _Procedure.MyProcedureInfo; // There may be levels of procedures, i.e. procedures within a procedure.
ProcedureInfo proc = _Procedure != null ? _Procedure.MyProcedureInfo : _ProcedureInfo; ProcedureInfo proc = _Procedure != null ? _Procedure.MyProcedureInfo : _ProcedureInfo;
while (proc.ActiveParent.GetType() == typeof(ProcedureInfo)) while (proc.ActiveParent.IsProcedure)
{ {
retval = proc.ProcedureConfig.GetValue(args.Group, args.Item); retval = proc.ProcedureConfig.GetValue(args.Group, args.Item);
if (retval != string.Empty) return retval; if (retval != string.Empty) return retval;

9
PROMS/VEPROMS.CSLA.Library/Config/SectionConfig.cs
View File

@ -63,18 +63,19 @@ namespace VEPROMS.CSLA.Library
if (args.AncestorLookup || ParentLookup) if (args.AncestorLookup || ParentLookup)
{ {
string retval; string retval;
// There may be levels of sections, i.e. sections within a section.
SectionInfo sect = _Section != null ? _Section.MySectionInfo : _SectionInfo; SectionInfo sect = _Section != null ? _Section.MySectionInfo : _SectionInfo;
while (sect.ActiveParent.GetType() == typeof(SectionInfo)) while (sect.ActiveParent.IsSection)
{ {
retval = sect.SectionConfig.GetValue(args.Group, args.Item); retval = sect.SectionConfig.GetValue(args.Group, args.Item);
if (retval != string.Empty) return retval; if (retval != string.Empty) return retval;
sect = (SectionInfo)sect.ActiveParent; sect = (sect.ActiveParent as SectionInfo) ?? SectionInfo.Get((sect.ActiveParent as ItemInfo).ItemID);
} }
// There may be levels of procedures, i.e. procedures within a procedure.
ProcedureInfo proc = ProcedureInfo.Get(((ItemInfo)sect.ActiveParent).ItemID); ProcedureInfo proc = ProcedureInfo.Get(((ItemInfo)sect.ActiveParent).ItemID);
//ProcedureInfo proc = (ProcedureInfo)sect.ActiveParent;
retval = proc.ProcedureConfig.GetValue(args.Group, args.Item); retval = proc.ProcedureConfig.GetValue(args.Group, args.Item);
if (retval != string.Empty) return retval; if (retval != string.Empty) return retval;
while (proc.ActiveParent.GetType() == typeof(ProcedureInfo)) while (proc.ActiveParent.IsProcedure)
{ {
retval = proc.ProcedureConfig.GetValue(args.Group, args.Item); retval = proc.ProcedureConfig.GetValue(args.Group, args.Item);
if (retval != string.Empty) return retval; if (retval != string.Empty) return retval;