From 46a74160702b74245431c009261b7e5060884f8d Mon Sep 17 00:00:00 2001
From: Kathy <kruffing@volian.com>
Date: Thu, 2 Dec 2010 15:21:29 +0000
Subject: [PATCH]

---
 .../Config/DocVersionConfig.cs                  | 17 +++++++++--------
 .../VEPROMS.CSLA.Library/Config/FolderConfig.cs | 17 +++++++++--------
 .../Config/SectionConfig.cs                     |  3 ++-
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/PROMS/VEPROMS.CSLA.Library/Config/DocVersionConfig.cs b/PROMS/VEPROMS.CSLA.Library/Config/DocVersionConfig.cs
index 0c55241a..dbaad654 100644
--- a/PROMS/VEPROMS.CSLA.Library/Config/DocVersionConfig.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Config/DocVersionConfig.cs
@@ -53,7 +53,7 @@ namespace VEPROMS.CSLA.Library
 		{
 			if (args.AncestorLookup || ParentLookup)
 			{
-				for (FolderInfo folder = _DocVersion.MyDocVersionInfo.MyFolder; folder != null; folder = folder.MyParent)
+				for (FolderInfo folder = _DocVersion != null ? _DocVersion.MyDocVersionInfo.MyFolder : _DocVersionInfo.MyFolder; folder != null; folder = folder.MyParent)
 				{
 					string retval = folder.FolderConfig.GetValue(args.Group, args.Item);
 					if (retval != string.Empty) return retval;
@@ -63,15 +63,15 @@ namespace VEPROMS.CSLA.Library
 		}
 		//private string Xp_LookInAncestorFolderInfo(object sender, XMLPropertiesArgs args)
 		//{
-		//  if (args.AncestorLookup || ParentLookup)
-		//  {
-		//    for (FolderInfo folder = _DocVersionInfo.MyFolder; folder != null; folder = folder.MyParent)
+		//    if (args.AncestorLookup || ParentLookup)
 		//    {
-		//      string retval = folder.FolderConfig.GetValue(args.Group, args.Item);
-		//      if (retval != string.Empty) return retval;
+		//        for (FolderInfo folder = _DocVersionInfo.MyFolder; folder != null; folder = folder.MyParent)
+		//        {
+		//            string retval = folder.FolderConfig.GetValue(args.Group, args.Item);
+		//            if (retval != string.Empty) return retval;
+		//        }
 		//    }
-		//  }
-		//  return string.Empty;
+		//    return string.Empty;
 		//}
 		private DocVersionInfo _DocVersionInfo;
 		public DocVersionConfig(DocVersionInfo docVersionInfo)
@@ -80,6 +80,7 @@ namespace VEPROMS.CSLA.Library
 			string xml = docVersionInfo.Config;
 			if (xml == string.Empty) xml = "<Config/>";
 			_Xp = new XMLProperties(xml);
+			if (docVersionInfo.MyFolder != null) _Xp.LookInAncestor += new XMLPropertiesEvent(Xp_LookInAncestorFolder);
 		}
 		public DocVersionConfig(string xml)
 		{
diff --git a/PROMS/VEPROMS.CSLA.Library/Config/FolderConfig.cs b/PROMS/VEPROMS.CSLA.Library/Config/FolderConfig.cs
index e52efdd7..5a1cf334 100644
--- a/PROMS/VEPROMS.CSLA.Library/Config/FolderConfig.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Config/FolderConfig.cs
@@ -58,7 +58,7 @@ namespace VEPROMS.CSLA.Library
 		{
 			if (ParentLookup || args.AncestorLookup)
 			{
-				for (FolderInfo folder = _Folder.MyFolderInfo.MyParent; folder != null; folder = folder.MyParent)
+				for (FolderInfo folder = _Folder != null?_Folder.MyFolderInfo.MyParent:_FolderInfo.MyParent; folder != null; folder = folder.MyParent)
 				{
 					string retval = folder.FolderConfig.GetValue(args.Group, args.Item);
 					if (retval != string.Empty) return retval;
@@ -77,15 +77,15 @@ namespace VEPROMS.CSLA.Library
 		}
 		//private string Xp_LookInAncestorFolderInfo(object sender, XMLPropertiesArgs args)
 		//{
-		//  if (args.AncestorLookup || ParentLookup)
-		//  {
-		//    for (FolderInfo folder = _FolderInfo.MyParent; folder != null; folder = folder.MyParent)
+		//    if (args.AncestorLookup || ParentLookup)
 		//    {
-		//      string retval = folder.FolderConfig.GetValue(args.Group, args.Item);
-		//      if (retval != string.Empty) return retval;
+		//        for (FolderInfo folder = _FolderInfo.MyParent; folder != null; folder = folder.MyParent)
+		//        {
+		//            string retval = folder.FolderConfig.GetValue(args.Group, args.Item);
+		//            if (retval != string.Empty) return retval;
+		//        }
 		//    }
-		//  }
-		//  return string.Empty;
+		//    return string.Empty;
 		//}
 		public FolderConfig(FolderInfo folderInfo)
 		{
@@ -93,6 +93,7 @@ namespace VEPROMS.CSLA.Library
 			string xml = _FolderInfo.Config;
 			if (xml == string.Empty) xml = "<config/>";
 			_Xp = new XMLProperties(xml);
+			if (_FolderInfo.MyParent != null) _Xp.LookInAncestor += new XMLPropertiesEvent(Xp_LookInAncestorFolder);
 		}
 		public FolderConfig(string xml)
 		{
diff --git a/PROMS/VEPROMS.CSLA.Library/Config/SectionConfig.cs b/PROMS/VEPROMS.CSLA.Library/Config/SectionConfig.cs
index 28918971..ea388a4d 100644
--- a/PROMS/VEPROMS.CSLA.Library/Config/SectionConfig.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Config/SectionConfig.cs
@@ -57,7 +57,7 @@ namespace VEPROMS.CSLA.Library
 			if (args.AncestorLookup || ParentLookup)
 			{
 				string retval;
-				SectionInfo sect = _Section.MySectionInfo;
+				SectionInfo sect = _Section != null ? _Section.MySectionInfo : _SectionInfo;
 				while (sect.ActiveParent.GetType() == typeof(SectionInfo))
 				{
 					retval = sect.SectionConfig.GetValue(args.Group, args.Item);
@@ -92,6 +92,7 @@ namespace VEPROMS.CSLA.Library
 			string xml = sectionInfo.MyContent.Config;
 			if (xml == string.Empty) xml = "<config/>";
 			_Xp = new XMLProperties(xml);
+			if (_SectionInfo.ActiveParent != null) _Xp.LookInAncestor += new XMLPropertiesEvent(Xp_LookInAncestorFolder);
 		}
 		public SectionConfig(string xml)
 		{