dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #43921
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 22282: minor fixes
------------------------------------------------------------
revno: 22282
committer: Morten Olav Hansen <morten@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2016-03-14 10:33:59 +0700
message:
minor fixes
modified:
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/DefaultObjectBundleService.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-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/DefaultObjectBundleService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/DefaultObjectBundleService.java 2016-03-14 01:58:51 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata2/objectbundle/DefaultObjectBundleService.java 2016-03-14 03:33:59 +0000
@@ -123,6 +123,9 @@
objectBundleValidation.addObjectErrorReports( preheatService.checkUniqueness( bundle.getObjects( klass, false ), bundle.getPreheat(),
bundle.getPreheatIdentifier() ) );
+ objectBundleValidation.addObjectErrorReports( preheatService.checkUniqueness( bundle.getObjects( klass, true ), bundle.getPreheat(),
+ bundle.getPreheatIdentifier() ) );
+
objectBundleValidation.addObjectErrorReports( preheatService.checkReferences( bundle.getObjectMap().get( klass ),
bundle.getPreheat(), bundle.getPreheatIdentifier() ) );
}
@@ -144,7 +147,7 @@
objectBundleValidation.addObjectErrorReports( validateForUpdate( klass, bundle.getObjects( klass, false ), bundle ) );
objectBundleValidation.addObjectErrorReports( validateBySchemas( klass, bundle.getObjects( klass, true ), bundle ) );
- objectBundleValidation.addObjectErrorReports( preheatService.checkUniqueness( bundle.getObjects( klass, false ), bundle.getPreheat(),
+ objectBundleValidation.addObjectErrorReports( preheatService.checkUniqueness( bundle.getObjects( klass, true ), bundle.getPreheat(),
bundle.getPreheatIdentifier() ) );
objectBundleValidation.addObjectErrorReports( preheatService.checkReferences( bundle.getObjectMap().get( klass ),