=== modified file 'dhis-2/dhis-services/dhis-service-excel-reporting/src/main/resources/META-INF/dhis/beans.xml'
--- dhis-2/dhis-services/dhis-service-excel-reporting/src/main/resources/META-INF/dhis/beans.xml 2010-10-29 12:19:15 +0000
+++ dhis-2/dhis-services/dhis-service-excel-reporting/src/main/resources/META-INF/dhis/beans.xml 2010-12-06 09:15:53 +0000
@@ -90,8 +90,4 @@
-
-
-
-
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/importDataParams.vm'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/importDataParams.vm 2010-03-08 16:36:21 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/importDataParams.vm 2010-12-06 09:15:53 +0000
@@ -14,7 +14,7 @@
$i18n.getString( 'select_excel_file' ) |
-
+
|
=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/imports.js'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/imports.js 2010-12-06 05:46:01 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/imports.js 2010-12-06 09:15:53 +0000
@@ -370,7 +370,7 @@
url:'uploadExcelImport.action',
secureuri:false,
fileElementId:'upload',
- dataType: 'json',
+ dataType: 'xml',
success: function (data, status)
{
window.location.reload();