dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 16784
committer: Tran Chau<tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-09-23 21:49:00 +0700
message:
  Fixed bug - Exception thrown when to run aggregate query build formulas.
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/sms/hibernate/OutboundSms.hbm.xml
  dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/caseaggregation/hibernate/HibernateCaseAggregationConditionStore.java


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/sms/hibernate/OutboundSms.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/sms/hibernate/OutboundSms.hbm.xml	2014-09-23 03:23:50 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/sms/hibernate/OutboundSms.hbm.xml	2014-09-23 14:49:00 +0000
@@ -10,7 +10,7 @@
       <generator class="native" />
     </id>
 
-    <set name="recipients" table="outbound_sms_recipients" fetch="join">
+    <set name="recipients" table="outbound_sms_recipients">
       <key column="outbound_sms_id" />
       <element type="text"/>
     </set>

=== modified file 'dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/caseaggregation/hibernate/HibernateCaseAggregationConditionStore.java'
--- dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/caseaggregation/hibernate/HibernateCaseAggregationConditionStore.java	2014-09-22 14:40:22 +0000
+++ dhis-2/dhis-services/dhis-service-eventreporting/src/main/java/org/hisp/dhis/caseaggregation/hibernate/HibernateCaseAggregationConditionStore.java	2014-09-23 14:49:00 +0000
@@ -982,7 +982,7 @@
         
         if (programId != null) 
         {
-            sql += " AND_pi.programid ";
+            sql += " AND _pi.programid = " + programId;
         }
  
         if (programId != null)