=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dxf2/MetaDataImportAction.java' --- dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dxf2/MetaDataImportAction.java 2015-02-17 06:00:52 +0000 +++ dhis-2/dhis-web/dhis-web-importexport/src/main/java/org/hisp/dhis/importexport/action/dxf2/MetaDataImportAction.java 2015-02-20 15:34:16 +0000 @@ -144,6 +144,13 @@ this.classKey = classKey; } + private boolean preheatCache = true; + + public void setPreheatCache( boolean preheatCache ) + { + this.preheatCache = preheatCache; + } + // ------------------------------------------------------------------------- // Action Implementation // ------------------------------------------------------------------------- @@ -165,6 +172,7 @@ ImportOptions importOptions = new ImportOptions(); importOptions.setStrategy( strategy.toString() ); importOptions.setDryRun( dryRun ); + importOptions.setPreheatCache( preheatCache ); String userId = user != null ? user.getUid() : null; === modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/dxf2MetaDataImport.vm' --- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/dxf2MetaDataImport.vm 2014-11-11 20:57:25 +0000 +++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/dxf2MetaDataImport.vm 2015-02-20 15:34:16 +0000 @@ -50,6 +50,17 @@ + $i18n.getString( "more_options" ) + + + $i18n.getString( "preload_cache" ) + + + + === modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/importMetaData.js' --- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/importMetaData.js 2014-11-11 20:57:25 +0000 +++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/importMetaData.js 2015-02-20 15:34:16 +0000 @@ -46,3 +46,8 @@ $( '#notificationDiv' ).hide(); $( '#importSummaryDiv' ).show( 'fast' ).load( 'getMetaDataImportSummary.action' ); } + +function toggleOptions() +{ + $( ".moreOptions" ).toggle(); +}