dhis2-devs team mailing list archive

Thread
Date

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2352: Re-added missing resources in common. And minor changed in excel reporting module.

To: DHIS 2 developers <dhis2-devs@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Mon, 13 Dec 2010 05:10:56 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 2352
committer: Hieu <hieu.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2010-12-13 12:08:29 +0700
message:
  Re-added missing resources in common. And minor changed in excel reporting module.
removed:
  dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/responseSuccess.vm
added:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlResponseError.vm
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlResponseInput.vm
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlResponseSuccess.vm
modified:
  dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/struts.xml
  dhis-2/dhis-web/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

=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlResponseError.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlResponseError.vm	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlResponseError.vm	2010-12-13 05:08:29 +0000
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<message type="error">$encoder.xmlEncode( $message )</message>
+
+

=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlResponseInput.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlResponseInput.vm	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlResponseInput.vm	2010-12-13 05:08:29 +0000
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<message type="input">$encoder.xmlEncode( $message )</message>
+
+

=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlResponseSuccess.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlResponseSuccess.vm	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/xmlResponseSuccess.vm	2010-12-13 05:08:29 +0000
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<message type="success">$encoder.xmlEncode( $message )</message>
+
+

=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/struts.xml	2010-12-08 06:08:16 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/resources/struts.xml	2010-12-13 05:08:29 +0000
@@ -255,7 +255,7 @@
 		<action name="updateOrganisationUnitGroupAtLevel"
 			class="org.hisp.dhis.reportexcel.organisationunitgrouplisting.action.UpdateOrganisationUnitGroupAtLevelAction">
 			<result name="success" type="velocity-xml">
-				/dhis-web-excel-reporting/responseSuccess.vm</result>
+				/dhis-web-commons/ajax/xmlResponseSuccess.vm</result>
 		</action>
 
 		<!-- REPORT EXCEL ASSOCIATION ACTION -->
@@ -384,14 +384,14 @@
 		<action name="copyReportExcelItems"
 			class="org.hisp.dhis.reportexcel.item.action.CopyReportExcelItemAction">
 			<result name="success" type="velocity-xml">
-				/dhis-web-excel-reporting/responseSuccess.vm</result>
+				/dhis-web-commons/ajax/xmlResponseSuccess.vm</result>
 			<param name="requiredAuthorities">F_EXCEL_REPORT_ADMINISTRATION</param>
 		</action>
 
 		<action name="copyExcelItemsToGroup"
 			class="org.hisp.dhis.reportexcel.excelitem.action.CopyExcelItemToGroupAction">
 			<result name="success" type="velocity-xml">
-				/dhis-web-excel-reporting/responseSuccess.vm</result>
+				/dhis-web-commons/ajax/xmlResponseSuccess.vm</result>
 			<param name="requiredAuthorities">F_COPY_EXCEL_ITEM_ADMINISTRATION</param>
 		</action>
 
@@ -451,25 +451,25 @@
 		<action name="generateReportCategory"
 			class="org.hisp.dhis.reportexcel.export.action.GenerateReportCategoryAction">
 			<result name="success" type="velocity-xml">
-				/dhis-web-excel-reporting/responseSuccess.vm</result>
+				/dhis-web-commons/ajax/xmlResponseSuccess.vm</result>
 		</action>
 
 		<action name="generateReportNormal"
 			class="org.hisp.dhis.reportexcel.export.action.GenerateReportNormalAction">
 			<result name="success" type="velocity-xml">
-				/dhis-web-excel-reporting/responseSuccess.vm</result>
+				/dhis-web-commons/ajax/xmlResponseSuccess.vm</result>
 		</action>
 
 		<action name="generateReportOrgGroupListing"
 			class="org.hisp.dhis.reportexcel.export.action.GenerateReportOrganizationGroupListingAction">
 			<result name="success" type="velocity-xml">
-				/dhis-web-excel-reporting/responseSuccess.vm</result>
+				/dhis-web-commons/ajax/xmlResponseSuccess.vm</result>
 		</action>
 
 		<action name="generateReportPeriodColumnListing"
 			class="org.hisp.dhis.reportexcel.export.action.GenerateReportPeriodColumnListingAction">
 			<result name="success" type="velocity-xml">
-				/dhis-web-excel-reporting/responseSuccess.vm</result>
+				/dhis-web-commons/ajax/xmlResponseSuccess.vm</result>
 		</action>
 
 
@@ -666,25 +666,25 @@
 		<action name="generateAdvancedReportNormal"
 			class="org.hisp.dhis.reportexcel.export.advance.action.GenerateAdvancedReportNormalAction">
 			<result name="success" type="velocity-xml">
-				/dhis-web-excel-reporting/responseSuccess.vm</result>
+				/dhis-web-commons/ajax/xmlResponseSuccess.vm</result>
 		</action>
 
 		<action name="generateAdvancedReportOrganizationGroupListing"
 			class="org.hisp.dhis.reportexcel.export.advance.action.GenerateAdvancedReportOrgGroupListingAction">
 			<result name="success" type="velocity-xml">
-				/dhis-web-excel-reporting/responseSuccess.vm</result>
+				/dhis-web-commons/ajax/xmlResponseSuccess.vm</result>
 		</action>
 
 		<action name="generateAdvancedReportPeriodColumnListingAction"
 			class="org.hisp.dhis.reportexcel.export.advance.action.GenerateAdvancedReportPeriodColumnListingAction">
 			<result name="success" type="velocity-xml">
-				/dhis-web-excel-reporting/responseSuccess.vm</result>
+				/dhis-web-commons/ajax/xmlResponseSuccess.vm</result>
 		</action>
 
 		<action name="generateAdvancedReportCategory"
 			class="org.hisp.dhis.reportexcel.export.action.GenerateAdvancedReportCategoryAction">
 			<result name="success" type="velocity-xml">
-				/dhis-web-excel-reporting/responseSuccess.vm</result>
+				/dhis-web-commons/ajax/xmlResponseSuccess.vm</result>
 		</action>
 
 		<!-- INDIVIDUAL REPORT EXCEL -->
@@ -722,7 +722,7 @@
 		<action name="cleanUpReportExcel"
 			class="org.hisp.dhis.reportexcel.action.CleanUpReportExcelAction">
 			<result name="success" type="velocity-xml">
-				/dhis-web-excel-reporting/responseSuccess.vm</result>
+				/dhis-web-commons/ajax/xmlResponseSuccess.vm</result>
 		</action>
 
 		<!-- PREVIEW ADVANCED REPORT -->
@@ -903,7 +903,7 @@
 		<action name="deleteDataElementGroupOrderForCategory"
 			class="org.hisp.dhis.reportexcel.excelitemgroup.dataelementgroup.action.DeleteDataElementGroupOrderForCategoryAction">
 			<result name="success" type="velocity-xml">
-				/dhis-web-excel-reporting/responseSuccess.vm</result>
+				/dhis-web-commons/ajax/xmlResponseSuccess.vm</result>
 		</action>
 
 		<action name="getDataElementGroupOrderForCategory"
@@ -924,13 +924,13 @@
 		<action name="updateSortedDataElementsForCategory"
 			class="org.hisp.dhis.reportexcel.excelitemgroup.dataelementgroup.action.UpdateSortedDataElementForCategoryAction">
 			<result name="success" type="velocity-xml">
-				/dhis-web-excel-reporting/responseSuccess.vm</result>
+				/dhis-web-commons/ajax/xmlResponseSuccess.vm</result>
 		</action>
 
 		<action name="updateSortedDataElementGroupOrderForCategory"
 			class="org.hisp.dhis.reportexcel.excelitemgroup.dataelementgroup.action.UpdateSortedDataElementGroupOrderForCategoryAction">
 			<result name="success" type="velocity-xml">
-				/dhis-web-excel-reporting/responseSuccess.vm</result>
+				/dhis-web-commons/ajax/xmlResponseSuccess.vm</result>
 		</action>
 
 		<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
@@ -1035,7 +1035,7 @@
 		<action name="copyExcelItems"
 			class="org.hisp.dhis.reportexcel.excelitem.action.CopyExcelItemAction">
 			<result name="success" type="velocity-xml">
-				/dhis-web-excel-reporting/responseSuccess.vm</result>
+				/dhis-web-commons/ajax/xmlResponseSuccess.vm</result>
 		</action>
 
 		<!-- IMPORT DATA -->

=== modified file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/exceltemplate.js'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/exceltemplate.js	2010-03-10 10:28:44 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/javascript/exceltemplate.js	2010-12-13 05:08:29 +0000
@@ -43,10 +43,8 @@
 
 function openEditExcelTemplate( currentFileName ) {
 
-	//byId("currentFileNameHidden").value = currentFileName;
 	curTemplateName = currentFileName;
 	$("#editExcelTemplateDiv").showAtCenter( true );
-
 }
 
 function validateRenamingExcelTemplate( fileName, columnIndex ) {

=== removed file 'dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/responseSuccess.vm'
--- dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/responseSuccess.vm	2009-09-14 03:19:36 +0000
+++ dhis-2/dhis-web/dhis-web-excel-reporting/src/main/webapp/dhis-web-excel-reporting/responseSuccess.vm	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<message type="success">$encoder.xmlEncode( $message )</message>
-
-