From: Patrick Schmitz <pschmitz@berkeley.edu>
Date: Wed, 27 Jul 2011 20:22:32 +0000 (+0000)
Subject: CSPACE-4263 - adding support in sample report to filter results by tenantid
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=cf2bebfd82f604ef317b27ea66df23a943b75f1e;p=tmp%2Fjakarta-migration.git

CSPACE-4263 - adding support in sample report to filter results by tenantid
---

diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/acq_basic.jasper b/services/report/3rdparty/jasper-cs-report/src/main/resources/acq_basic.jasper
index d367069e5..ca81228b2 100644
Binary files a/services/report/3rdparty/jasper-cs-report/src/main/resources/acq_basic.jasper and b/services/report/3rdparty/jasper-cs-report/src/main/resources/acq_basic.jasper differ
diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/acq_basic.jrxml b/services/report/3rdparty/jasper-cs-report/src/main/resources/acq_basic.jrxml
index fd48781af..337482b54 100644
--- a/services/report/3rdparty/jasper-cs-report/src/main/resources/acq_basic.jrxml
+++ b/services/report/3rdparty/jasper-cs-report/src/main/resources/acq_basic.jrxml
@@ -17,7 +17,10 @@
 		<defaultValueExpression><![CDATA[null]]></defaultValueExpression>
 	</parameter>
 	<parameter name="where_clause" class="java.lang.String" isForPrompting="false">
-		<defaultValueExpression><![CDATA[(($P{csid}==null||($P{csid}.length()==0))?"":" WHERE hierarchy.name = '"+$P{csid}+"'")]]></defaultValueExpression>
+		<defaultValueExpression><![CDATA[(($P{csid}==null||($P{csid}.length()==0))?"":" AND hierarchy.name = '"+$P{csid}+"'")]]></defaultValueExpression>
+	</parameter>
+	<parameter name="tenantid" class="java.lang.String">
+		<defaultValueExpression><![CDATA["1"]]></defaultValueExpression>
 	</parameter>
 	<queryString>
 		<![CDATA[SELECT
@@ -31,6 +34,8 @@
      acquisitions_common."acquisitionreason" AS acquisitions_common_acquisitionreason
 FROM
      "public"."acquisitions_common" acquisitions_common INNER JOIN "public"."hierarchy" hierarchy ON acquisitions_common."id" = hierarchy."id"
+INNER JOIN "public"."collectionspace_core" core ON acquisitions_common."id" = core."id"
+WHERE core.tenantid = $P{tenantid}
 $P!{where_clause}]]>
 	</queryString>
 	<field name="acquisitions_common_originalobjectpurchasepricevalue" class="java.lang.String"/>