dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 448
committer: Lars Helge Oeverland larshelge@xxxxxxxxx
branch nick: trunk
timestamp: Thu 2009-07-09 00:52:31 +0200
message:
  Minor fix.
modified:
  dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/service/DefaultImportObjectService.java

=== modified file 'dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/service/DefaultImportObjectService.java'
--- dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/service/DefaultImportObjectService.java	2009-06-10 22:25:07 +0000
+++ dhis-2/dhis-services/dhis-service-importexport/src/main/java/org/hisp/dhis/importexport/service/DefaultImportObjectService.java	2009-07-08 22:52:31 +0000
@@ -325,7 +325,8 @@
             {
                 DataSet dataSet = (DataSet) importObject.getObject();
                 
-                deleteGroupAssociations( GroupMemberType.DATASET, dataSet.getId() );             
+                deleteGroupAssociations( GroupMemberType.DATASET, dataSet.getId() );
+                deleteMemberAssociations( GroupMemberType.DATASET_SOURCE, dataSet.getId() );
                 deleteMemberAssociations( GroupMemberType.REPORTTABLE_DATASET, dataSet.getId() );
                 
                 deleteCompleteDataSetRegistrationsByDataSet( dataSet.getId() );
@@ -334,8 +335,9 @@
             {
                 OrganisationUnit unit = (OrganisationUnit) importObject.getObject();
                 
-                deleteMemberAssociations( GroupMemberType.ORGANISATIONUNITGROUP, unit.getId() );                
-                deleteGroupAssociations( GroupMemberType.ORGANISATIONUNITRELATIONSHIP, unit.getId() );                
+                deleteMemberAssociations( GroupMemberType.ORGANISATIONUNITGROUP, unit.getId() );               
+                deleteGroupAssociations( GroupMemberType.ORGANISATIONUNITRELATIONSHIP, unit.getId() );
+                deleteMemberAssociations( GroupMemberType.DATASET_SOURCE, unit.getId() );
                 deleteMemberAssociations( GroupMemberType.ORGANISATIONUNITRELATIONSHIP, unit.getId() );                
                 deleteMemberAssociations( GroupMemberType.REPORTTABLE_ORGANISATIONUNIT, unit.getId() );
                 
@@ -709,7 +711,7 @@
 
     private void deleteGroupAssociations( GroupMemberType groupMemberType, int groupId )
     {
-        Collection<ImportObject> importObjects = importObjectStore.getImportObjects( groupMemberType);
+        Collection<ImportObject> importObjects = importObjectStore.getImportObjects( groupMemberType );
         
         for ( ImportObject importObject : importObjects )
         {



--
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.