dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 4625
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2011-09-21 10:42:11 +0700
message:
  Fixed bug export stream file to client side which doesn't working in Chrome and FF browser.
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/macros.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElement.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicator.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnit.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/user.js
  dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/validationRule.vm


--
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-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js	2011-09-16 09:29:21 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js	2011-09-21 03:42:11 +0000
@@ -1344,7 +1344,9 @@
 		return;
 	}
 	
-	jQuery.postUTF8( 'exportToPdf.action', params, function(){} );
+	var form = byId( 'filterKeyForm' );
+	form.action = 'exportToPdf.action?' + params;
+	form.submit();
 }
 
 /**

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/macros.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/macros.vm	2011-09-20 14:48:24 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/macros.vm	2011-09-21 03:42:11 +0000
@@ -116,7 +116,7 @@
 
 #macro( filterDiv $action )
 $i18n.getString( "filter_by_name" ):
-<form action="${action}.action" method="POST">
+<form id="filterKeyForm" action="${action}.action" method="POST">
 	<div style="inline">
 		#set ($value = $encoder.htmlEncode( ${key} ))
 		<input type="text" id="key" name="key" value="$!value"/>

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElement.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElement.js	2011-09-10 08:40:27 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElement.js	2011-09-21 03:42:11 +0000
@@ -1,10 +1,7 @@
 function exportPDF( type )
-{
-	var params = {
-		type: type,
-		key: jQuery( 'input[type=text][name=key]' ).val(),
-		dataDictionaryId: jQuery( '#dataDictionaryList' ).val()
-	};
+{	
+	var params = "type=" + type;
+	params += "&dataDictionaryId=" + jQuery( '#dataDictionaryList' ).val();
 	
 	exportPdfByType( params );
 }

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicator.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicator.js	2011-09-10 08:40:27 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicator.js	2011-09-21 03:42:11 +0000
@@ -1,10 +1,7 @@
 function exportPDF( type )
 {
-	var params = {
-		type: type,
-		key: jQuery( 'input[type=text][name=key]' ).val(),
-		dataDictionaryId: jQuery( '#dataDictionaryList' ).val()
-	};
+	var params = "type=" + type;
+	params += "&dataDictionaryId=" + jQuery( '#dataDictionaryList' ).val();
 	
 	exportPdfByType( params );
 }

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnit.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnit.js	2011-09-14 03:44:56 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/javascript/organisationUnit.js	2011-09-21 03:42:11 +0000
@@ -18,10 +18,7 @@
 
 function exportPDF( type )
 {
-	var params = {
-		type: type,
-		key: jQuery( 'input[type=text][name=key]' ).val()
-	};
+	var params = "type=" + type;
 	
 	exportPdfByType( params );
 }

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/user.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/user.js	2011-09-10 08:40:27 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/webapp/dhis-web-maintenance-user/javascript/user.js	2011-09-21 03:42:11 +0000
@@ -4,12 +4,9 @@
 // -----------------------------------------------------------------------------
 
 function exportPDF( type )
-{
-	var params = {
-		type: type,
-		key: jQuery( 'input[type=text][id=key]' ).val(),
-		months: jQuery( '#months' ).val()
-	};
+{	
+	var params = "type=" + type;
+	params += "&months=" + jQuery( '#months' ).val();
 
 	exportPdfByType( params );
 }

=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/validationRule.vm'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/validationRule.vm	2011-09-10 08:40:27 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/webapp/dhis-web-validationrule/validationRule.vm	2011-09-21 03:42:11 +0000
@@ -5,11 +5,7 @@
 	
 	function exportPDF( type )
 	{
-		var params =
-		{
-			type: type,
-			key: jQuery( 'input[type=text][name=key]' ).val()
-		};
+		var params = "type=" + type;
 		
 		exportPdfByType( params );
 	}