------------------------------------------------------------
revno: 21282
committer: Morten Olav Hansen <morte...@gmail.com>
branch nick: dhis2
timestamp: Thu 2015-12-03 14:12:19 +0700
message:
minor fix
modified:
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/datavalue/ImportDataValueAction.java
dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/event/ImportEventAction.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-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/datavalue/ImportDataValueAction.java'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/datavalue/ImportDataValueAction.java 2015-12-03 07:07:47 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/datavalue/ImportDataValueAction.java 2015-12-03 07:12:19 +0000
@@ -158,9 +158,7 @@
in = StreamUtils.wrapAndCheckCompressionFormat( in );
ImportOptions options = new ImportOptions().setDryRun( dryRun )
- .setPreheatCache( preheatCache ).setStrategy( strategy ).setSkipExistingCheck( skipExistingCheck );
-
- options.getIdSchemes()
+ .setPreheatCache( preheatCache ).setStrategy( strategy ).setSkipExistingCheck( skipExistingCheck )
.setIdScheme( idScheme.toString() )
.setDataElementIdScheme( dataElementIdScheme.toString() )
.setOrgUnitIdScheme( orgUnitIdScheme.toString() );
=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/event/ImportEventAction.java'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/event/ImportEventAction.java 2015-12-03 07:07:47 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/event/ImportEventAction.java 2015-12-03 07:12:19 +0000
@@ -136,7 +136,7 @@
ImportOptions importOptions = new ImportOptions();
importOptions.setDryRun( dryRun );
- importOptions.getIdSchemes().setOrgUnitIdScheme( orgUnitIdScheme.toString() );
+ importOptions.setOrgUnitIdScheme( orgUnitIdScheme.toString() );
if ( FORMAT_CSV.equals( payloadFormat ) )
{
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
