summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntje Fuhrmann2013-04-08 02:50:16 (EDT)
committer Stephan Born2013-04-08 02:50:16 (EDT)
commit34ab907fac2a4a1aca75b47f5d34209fccbede6c (patch)
tree740246815fcf7d88de423dfbbf12e8ae97bf449c
parentbad961e7f5a2a3f4251b42f6e70635205e57fdf7 (diff)
downloadorg.eclipse.stardust.reporting.rt-34ab907fac2a4a1aca75b47f5d34209fccbede6c.zip
org.eclipse.stardust.reporting.rt-34ab907fac2a4a1aca75b47f5d34209fccbede6c.tar.gz
org.eclipse.stardust.reporting.rt-34ab907fac2a4a1aca75b47f5d34209fccbede6c.tar.bz2
Jira-ID: CRNT-28549
Merge changes done on b_dev_5_3_x after 5.3.19.GA (5.3.19.4-r58998) through 5.3.20.GA (5.3.20.XX-rXXXXX) to 7.2 (TRUNK) - kernel / modeler / build (merged CRNT-27439: In report data of structured data list type are not shown.) git-svn-id: https://svn.csa.sungard.com/repos/ipp2/product/trunk/stardust/reporting.rt@64098 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b Signed-off-by: Antje Fuhrmann <antje.fuhrmann@sungard.com>
-rw-r--r--org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/StructDataColumn.java9
1 files changed, 7 insertions, 2 deletions
diff --git a/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/StructDataColumn.java b/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/StructDataColumn.java
index 2368cda..eb2fc37 100644
--- a/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/StructDataColumn.java
+++ b/org.eclipse.stardust.reporting.common/src/org/eclipse/stardust/reporting/common/StructDataColumn.java
@@ -225,14 +225,19 @@ public class StructDataColumn extends AbstractDataColumn implements IOneOfManyCo
if(sameParentColumns != null && !sameParentColumns.isEmpty())
{
StructDataColumn sameParentColumn = sameParentColumns.get(0);
- buffer.append(" and ");
+ buffer.append(" and (");
+ buffer.append(sameParentColumn.getAlias());
+ buffer.append(".");
+ buffer.append(StructuredDataValueBean.FIELD__PARENT);
+ buffer.append(" is null or ");
buffer.append(getAlias());
buffer.append(".");
buffer.append(StructuredDataValueBean.FIELD__PARENT);
buffer.append(" = ");
buffer.append(sameParentColumn.getAlias());
buffer.append(".");
- buffer.append(StructuredDataValueBean.FIELD__PARENT);
+ buffer.append(StructuredDataValueBean.FIELD__PARENT);
+ buffer.append(")");
}
}