← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 16060: Minor

 

------------------------------------------------------------
revno: 16060
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2014-07-09 17:43:12 +0200
message:
  Minor
modified:
  dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/eventchart/EventChart.hbm.xml
  dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/eventreport/EventReport.hbm.xml


--
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-tracker/src/main/resources/org/hisp/dhis/eventchart/EventChart.hbm.xml'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/eventchart/EventChart.hbm.xml	2014-07-09 15:39:52 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/eventchart/EventChart.hbm.xml	2014-07-09 15:43:12 +0000
@@ -36,12 +36,12 @@
     <many-to-one name="relatives" unique="true" class="org.hisp.dhis.period.RelativePeriods" column="relativeperiodsid"
       cascade="all-delete-orphan" foreign-key="fk_report_relativeperiodsid" />
 
-    <list name="organisationUnitGroups" table="reporttable_orgunitgroups">
+    <list name="organisationUnitGroups" table="eventchart_orgunitgroups">
       <cache usage="read-write" />
-      <key column="reporttableid" foreign-key="fk_reporttable_orgunitunitgroups_reporttableid" />
+      <key column="eventchartid" foreign-key="fk_eventchart_orgunitunitgroups_eventchartid" />
       <list-index column="sort_order" base="0" />
       <many-to-many column="orgunitgroupid" class="org.hisp.dhis.organisationunit.OrganisationUnitGroup"
-        foreign-key="fk_reporttable_orgunitgroups_orgunitgroupid" />
+        foreign-key="fk_eventchart_orgunitgroups_orgunitgroupid" />
     </list>
 
     <list name="organisationUnitLevels" table="eventchart_orgunitlevels">

=== modified file 'dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/eventreport/EventReport.hbm.xml'
--- dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/eventreport/EventReport.hbm.xml	2014-07-09 15:39:52 +0000
+++ dhis-2/dhis-services/dhis-service-tracker/src/main/resources/org/hisp/dhis/eventreport/EventReport.hbm.xml	2014-07-09 15:43:12 +0000
@@ -36,12 +36,12 @@
     <many-to-one name="relatives" unique="true" class="org.hisp.dhis.period.RelativePeriods" column="relativeperiodsid"
       cascade="all-delete-orphan" foreign-key="fk_report_relativeperiodsid" />
 
-    <list name="organisationUnitGroups" table="reporttable_orgunitgroups">
+    <list name="organisationUnitGroups" table="eventreport_orgunitgroups">
       <cache usage="read-write" />
-      <key column="reporttableid" foreign-key="fk_reporttable_orgunitunitgroups_reporttableid" />
+      <key column="eventreportid" foreign-key="fk_eventreport_orgunitunitgroups_eventreportid" />
       <list-index column="sort_order" base="0" />
       <many-to-many column="orgunitgroupid" class="org.hisp.dhis.organisationunit.OrganisationUnitGroup"
-        foreign-key="fk_reporttable_orgunitgroups_orgunitgroupid" />
+        foreign-key="fk_eventreport_orgunitgroups_orgunitgroupid" />
     </list>
 
     <list name="organisationUnitLevels" table="eventreport_orgunitlevels">