dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 17682
committer: jimgrace@xxxxxxxxx
branch nick: dhis2
timestamp: Mon 2014-12-08 21:51:54 -0500
message:
  make managedByGroups the inverse property in managedGroups relationship table
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/user/hibernate/UserGroup.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-core/src/main/resources/org/hisp/dhis/user/hibernate/UserGroup.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/user/hibernate/UserGroup.hbm.xml	2014-12-07 22:15:55 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/user/hibernate/UserGroup.hbm.xml	2014-12-09 02:51:54 +0000
@@ -22,17 +22,17 @@
       <many-to-many column="userid" class="org.hisp.dhis.user.User" foreign-key="fk_usergroupmembers_userid" />
     </set>
 
-    <set name="managedByGroups" table="usergroupmanaged">
+    <set name="managedGroups" table="usergroupmanaged">
       <cache usage="read-write" />
+      <key column="managedbygroupid" />
+      <many-to-many column="managedgroupid" class="org.hisp.dhis.user.UserGroup" />
+    </set>
+
+    <set name="managedByGroups" table="usergroupmanaged" inverse="true">
       <key column="managedgroupid" foreign-key="fk_usergroupmanaging_managedgroupid" />
       <many-to-many column="managedbygroupid" class="org.hisp.dhis.user.UserGroup" foreign-key="fk_usergroupmanaging_managedbygroupid" />
     </set>
 
-    <set name="managedGroups" table="usergroupmanaged" inverse="true">
-      <key column="managedbygroupid" />
-      <many-to-many column="managedgroupid" class="org.hisp.dhis.user.UserGroup" />
-    </set>
-
     <!-- Access properties -->
     <many-to-one name="user" class="org.hisp.dhis.user.User" column="userid" foreign-key="fk_usergroup_userid" />