From 2c4f1280caddc097fa53b0b2e6b6ab73912d0a29 Mon Sep 17 00:00:00 2001 From: John Date: Wed, 28 Sep 2011 13:24:16 +0000 Subject: [PATCH] Add logic for multiple return values to AccPageID lookup --- PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs b/PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs index 518341e1..531727e4 100644 --- a/PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs +++ b/PROMS/VEPROMS.CSLA.Library/Config/ROFSTLookup.cs @@ -800,19 +800,29 @@ namespace VEPROMS.CSLA.Library public string GetROValueByAccPagID(string accPageID, string spDefault, string igDefault) { rochild? child = GetRoChildByAccPagID(accPageID, spDefault, igDefault); - if (child != null) return ((rochild)child).value; + if (child == null) return null; + if(((rochild)child).children.Length > 0) + return ((rochild)child).children[0].value; + string val = ((rochild)child).value; + if (val != null) return val; return null; } public int? GetROTypeByAccPagID(string accPageID, string spDefault, string igDefault) { rochild? child = GetRoChildByAccPagID(accPageID, spDefault, igDefault); - if (child != null) return ((rochild)child).type; + if (child == null) return null; + if (((rochild)child).children.Length > 0) + return ((rochild)child).children[0].type; + return ((rochild)child).type; return null; } public string GetROIDByAccPagID(string accPageID, string spDefault, string igDefault) { rochild? child = GetRoChildByAccPagID(accPageID, spDefault, igDefault); - if (child != null) return ((rochild)child).roid; + if (child == null) return null; + if (((rochild)child).children.Length > 0) + return ((rochild)child).children[0].roid; + return ((rochild)child).roid; return null; } public rochild? GetRoChildByAccPagID(string accPageID, string spDefault, string igDefault)