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

Fixed issue getting the parent’s config values

Browse Source
This commit is contained in:
John Jenko 2014-10-29 14:58:33 +00:00
parent 9e565cfd05
commit 290d2c8abf
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,9 +73,9 @@ namespace VEPROMS.CSLA.Library
ProcedureInfo proc = _Procedure != null ? _Procedure.MyProcedureInfo : _ProcedureInfo; ProcedureInfo proc = _Procedure != null ? _Procedure.MyProcedureInfo : _ProcedureInfo;
while (proc.ActiveParent.IsProcedure) while (proc.ActiveParent.IsProcedure)
{ {
proc = (ProcedureInfo)proc.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;
proc = (ProcedureInfo)proc.ActiveParent;
} }
DocVersionInfo docVersion = proc.ActiveParent as DocVersionInfo; DocVersionInfo docVersion = proc.ActiveParent as DocVersionInfo;
if (docVersion == null) return string.Empty; if (docVersion == null) return string.Empty;

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

@ -67,9 +67,9 @@ namespace VEPROMS.CSLA.Library
SectionInfo sect = _Section != null ? _Section.MySectionInfo : _SectionInfo; SectionInfo sect = _Section != null ? _Section.MySectionInfo : _SectionInfo;
while (sect.ActiveParent.IsSection) while (sect.ActiveParent.IsSection)
{ {
sect = (sect.ActiveParent as SectionInfo) ?? SectionInfo.Get((sect.ActiveParent as ItemInfo).ItemID);
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 = (sect.ActiveParent as SectionInfo) ?? SectionInfo.Get((sect.ActiveParent as ItemInfo).ItemID);
} }
// There may be levels of procedures, i.e. procedures within a procedure. // There may be levels of procedures, i.e. procedures within a procedure.
ProcedureInfo proc = sect.MyProcedure; ProcedureInfo proc = sect.MyProcedure;