dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 18368
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2015-02-20 16:34:16 +0100
message:
  Meta data import UI, added option for skipping preheat of cache. Much faster for small imports on big databases.
modified:
  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/webapp/dhis-web-importexport/dxf2MetaDataImport.vm
  dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/importMetaData.js


--
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/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 @@
 </tr>
 <tr>
 	<td></td>
+	<td><a href="javascript:toggleOptions()">$i18n.getString( "more_options" )</a></td>
+</tr>
+<tr class="moreOptions" style="display:none">
+	<td>$i18n.getString( "preload_cache" )</td>
+	<td><select id="preheatCache" name="preheatCache" style="width:190px">
+		<option value="true">$i18n.getString( "yes" )</option>
+		<option value="false">$i18n.getString( "no" ) ($i18n.getString( "faster_for_small_imports" ))</option>
+    </select></td>
+</tr>
+<tr>
+	<td></td>
 	<td><input type="button" value="$i18n.getString( 'import' )" style="width:120px" onclick="importMetaData()"/></td>
 </tr>
 </table>

=== 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();
+}