dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 4125
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2011-07-13 08:40:49 +0200
message:
  Fixed bug with import
modified:
  dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/importForm.vm
  dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/import.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/webapp/dhis-web-importexport/importForm.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/importForm.vm	2011-06-27 10:30:38 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/importForm.vm	2011-07-13 06:40:49 +0000
@@ -1,8 +1,6 @@
 <script type="text/javascript">
 	jQuery(document).ready(function() {
 		getImportStatus();
-        
-        jQuery("#type").bind("change", setSubmitButtonText);
 	});
 
 	var i18n_done = '$encoder.jsEscape( $i18n.getString( "done" ), "'" )';
@@ -11,10 +9,6 @@
 	var i18n_hide_advanced_options = '$encoder.jsEscape( $i18n.getString( "hide_advanced_options" ), "'" )';
 	var i18n_completed = '$encoder.jsEscape( $i18n.getString( "completed" ), "'" )';
 	var i18n_current_import_file = '$encoder.jsEscape( $i18n.getString( "current_import_file" ), "'" )';
-    
-    function setSubmitButtonText(event) {
-        jQuery("#submit").val(jQuery(this).find("option:selected").html());
-    }
 </script>
 
 <h3>$i18n.getString( "$importFormat" ) $i18n.getString( "import" ) #openHelp( "import" )</h3>
@@ -131,7 +125,7 @@
 		
 	<tr>
 		<td colspan="2">
-			<input id="submit" type="button" value="$i18n.getString( 'import' )" onclick="submitImportForm()" style="width:50%"><input 
+			<input type="submit" value="$i18n.getString( 'import' )" style="width:50%"><input 
 				type="button" id="optionButton" value="$i18n.getString( 'show_advanced_options' )" onclick="showAdvancedOptions()" style="width:50%">
 		</td>
   	</tr>

=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/import.js'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/import.js	2011-04-24 12:47:31 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/import.js	2011-07-13 06:40:49 +0000
@@ -3,12 +3,6 @@
 // Import
 // -------------------------------------------------------------------------
 
-function submitImportForm()
-{
-    setWaitMessage( i18n_importing ); 
-	document.getElementById( "importForm" ).submit();
-}
-
 function showAdvancedOptions()
 {
 	var optionDiv = document.getElementById( "optionDiv" );