dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 17614
committer: Mithilesh Kumar Thakur <mithilesh.hisp@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2014-11-29 05:51:57 +0000
message:
  local/in Maintenance RBF work in progress
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties
  local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/responseDataElementAndPeriods.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-services/dhis-service-core/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties	2014-11-25 16:39:09 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties	2014-11-29 05:51:57 +0000
@@ -71,6 +71,7 @@
 dhis-web-sms=SMS
 dhis-web-maintenance-in=Configuration
 dhis-web-linelisting-mp=Manpower
+dhis-web-maintenance-rbf=Maintenance RBF
 
 #-- Intro modules -------------------------------------------------------------#
 

=== modified file 'local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/responseDataElementAndPeriods.vm'
--- local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/responseDataElementAndPeriods.vm	2014-10-24 11:05:35 +0000
+++ local/in/dhis-web-maintenance-rbf/src/main/webapp/dhis-web-maintenance-rbf/responseDataElementAndPeriods.vm	2014-11-29 05:51:57 +0000
@@ -4,13 +4,13 @@
 	#foreach( $dataElement in $dataElements )	
 		<dataelement>
 			<id>$dataElement.id</id>
-			<name>$dataElement.getName()</name>
+			<name>$encoder.xmlEncode( $dataElement.getName() )</name>
 		</dataelement>
 	#end
 	#foreach( $period in $periods )	
 		<period>
 			<id>$period.id</id>
-			<name>$period.name</name>
+			<name>$encoder.xmlEncode( $period.name )</name>
 		</period>
 	#end
 </dataElements>