dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3926
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2011-06-17 10:05:12 +0700
message:
  Fixed bug <798149> Can't add new Export report (local vn).
modified:
  local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/filemanager/action/ExcelTemplateListAction.java
  local/vn/dhis-web-excel-reporting/src/main/resources/struts.xml


--
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/java/org/hisp/dhis/reportexcel/filemanager/action/ExcelTemplateListAction.java'
--- local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/filemanager/action/ExcelTemplateListAction.java	2011-06-07 10:07:02 +0000
+++ local/vn/dhis-web-excel-reporting/src/main/java/org/hisp/dhis/reportexcel/filemanager/action/ExcelTemplateListAction.java	2011-06-17 03:05:12 +0000
@@ -169,10 +169,6 @@
 
             exportReport = exportReportService.getExportReport( id );
         }
-        else
-        {
-            return ERROR;
-        }
 
         File templateDirectory = reportLocationManager.getReportExcelTemplateDirectory();
 

=== 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-06-07 10:07:02 +0000
+++ local/vn/dhis-web-excel-reporting/src/main/resources/struts.xml	2011-06-17 03:05:12 +0000
@@ -156,7 +156,6 @@
 		<action name="updateExportReportForm"
 			class="org.hisp.dhis.reportexcel.filemanager.action.ExcelTemplateListAction">
 			<result name="success" type="velocity">/main.vm</result>
-			<result name="error" type="redirect">listAllExportReport.action</result>
 			<param name="page">/dhis-web-excel-reporting/report/updateExportReportForm.vm</param>
 			<param name="javascripts">javascript/exportReports.js</param>			
 			<param name="requiredAuthorities">F_EXCEL_REPORT_ADMINISTRATION</param>
@@ -627,9 +626,9 @@
 		<action name="exportXML"
 			class="org.hisp.dhis.reportexcel.preview.action.ExportXMLAction">
 			<result name="success" type="velocity-xml">
-				/dhis-web-excel-reporting/responseExportReportPreview.vm</result>			
+				/dhis-web-excel-reporting/responseExportReportPreview.vm</result>
 			<result name="error" type="velocity-xml">
-				/dhis-web-commons/ajax/xmlResponseError.vm</result>			
+				/dhis-web-commons/ajax/xmlResponseError.vm</result>
 		</action>
 
 		<!--  GERERATE ADVANCE -->