dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3705
committer: catakim <catakim@kavo-PC>
branch nick: dhis2_May
timestamp: Mon 2011-05-23 12:36:39 +0700
message:
  local vn - Applied file patch from Hieu into using jquery.upload instead of ajaxFileUpload
modified:
  local/vn/dhis-web-excel-reporting/src/main/resources/struts.xml
  local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/excelTemplateList.vm
  local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/exceltemplate.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 'local/vn/dhis-web-excel-reporting/src/main/resources/struts.xml'
--- local/vn/dhis-web-excel-reporting/src/main/resources/struts.xml	2011-05-18 09:23:52 +0000
+++ local/vn/dhis-web-excel-reporting/src/main/resources/struts.xml	2011-05-23 05:36:39 +0000
@@ -1189,10 +1189,7 @@
 			<result name="success" type="velocity">/main.vm</result>
 			<param name="page">/dhis-web-excel-reporting/excelTemplateList.vm</param>
 			<param name="menu">/dhis-web-excel-reporting/menu.vm</param>
-			<param name="javascripts">
-				javascript/exceltemplate.js,
-				javascript/ajaxfileupload.js			
-			</param>
+			<param name="javascripts">javascript/exceltemplate.js</param>
 			<param name="requiredAuthorities">F_EXCEL_REPORT_ADMINISTRATION</param>
 		</action>
 

=== modified file 'local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/excelTemplateList.vm'
--- local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/excelTemplateList.vm	2011-03-25 09:11:30 +0000
+++ local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/excelTemplateList.vm	2011-05-23 05:36:39 +0000
@@ -10,7 +10,7 @@
 				,errorElement:"td"
 				,submitHandler: function(form)
 				{
-					validateUploadExcelTemplate();
+					validateUploadExcelTemplate(form);
 				}
 			});
 

=== modified file 'local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/exceltemplate.js'
--- local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/exceltemplate.js	2011-01-25 17:29:41 +0000
+++ local/vn/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/exceltemplate.js	2011-05-23 05:36:39 +0000
@@ -217,44 +217,24 @@
 	return true;
 }
 
-function validateUploadExcelTemplate()
-{
-	$.ajaxFileUpload
-	(
+function validateUploadExcelTemplate(form)
+{        
+	jQuery( "#upload" ).upload( 'validateUploadExcelTemplate.action',
+		function(data)
 		{
-			url:'validateUploadExcelTemplate.action',
-			secureuri:false,
-			fileElementId:'upload',
-			dataType: 'xml',
-			success: function (data, status)
-			{
-				data = data.getElementsByTagName('message')[0];
-				var type = data.getAttribute("type");
-				
-				if ( type == 'error' )
-				{                    
-					setMessage( data.firstChild.nodeValue );
-				}
-				else if ( type == 'input' )
-				{
-					if ( window.confirm( i18n_confirm_override ) )
-					{
-						document.forms['uploadForm'].submit();
-					}
-					else
-					{
-						return;
-					}
-				}
-				else
-				{
-					document.forms['uploadForm'].submit();
-				}
-			},
-			error: function (data, status, e)
-			{
-			
-			}
+			data = data.getElementsByTagName('message')[0];
+			var type = data.getAttribute("type");
+
+			if ( type == 'error' )
+			{                    
+				setMessage( data.firstChild.nodeValue );
+			}
+			else if ( type == 'input' )
+			{
+				if ( window.confirm( i18n_confirm_override ) ) form.submit();
+				else return;
+			}
+			else form.submit();
 		}
 	);
 }
\ No newline at end of file