Compare commits
2 Commits
50e0fcb2b4
...
1f125619f3
Author | SHA1 | Date | |
---|---|---|---|
1f125619f3 | |||
5be9daa019 |
@ -746,7 +746,7 @@ namespace RODBInterface
|
|||||||
string csufx = string.Format("_PCCHILD{0}", pcChildIdx);
|
string csufx = string.Format("_PCCHILD{0}", pcChildIdx);
|
||||||
//applicValues += ",";
|
//applicValues += ",";
|
||||||
XmlNode cn = elmnode.SelectSingleNode(parentName + csufx);
|
XmlNode cn = elmnode.SelectSingleNode(parentName + csufx);
|
||||||
if (cn == null)
|
if (cn == null || cn.InnerText.Length == 0) // B2024-004 use Parent value if Child text length is zero
|
||||||
applicValues += string.Format(",UnitIdx={0} Value={1}", pcChildIdx, parentValue); // use parent value as default
|
applicValues += string.Format(",UnitIdx={0} Value={1}", pcChildIdx, parentValue); // use parent value as default
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -473,7 +473,7 @@ namespace ctlXMLEditLib
|
|||||||
nd = node.SelectSingleNode(str);
|
nd = node.SelectSingleNode(str);
|
||||||
// if not found with just the string, search the tree.
|
// if not found with just the string, search the tree.
|
||||||
if (nd==null)nd = node.SelectSingleNode("*/"+str);
|
if (nd==null)nd = node.SelectSingleNode("*/"+str);
|
||||||
if (nd == null)
|
if (nd == null || nd.InnerText.Length==0) // B2024-004 use Parent value if Child text length is zero
|
||||||
GetDefaultParentValue(hwnd, node, str); // C2021-026 Parent/Child Field has no value so use parent's value
|
GetDefaultParentValue(hwnd, node, str); // C2021-026 Parent/Child Field has no value so use parent's value
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user