dhis2-devs team mailing list archive

Thread
Date

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 12798: Case entry, jd encoding org unit names

To: DHIS 2 developers <dhis2-devs@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Tue, 22 Oct 2013 16:58:31 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 12798
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2013-10-22 18:57:47 +0200
message:
  Case entry, jd encoding org unit names
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectPatient.vm
  dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/sendBeneficiarySMSPage.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-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectPatient.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectPatient.vm	2013-10-15 10:10:06 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectPatient.vm	2013-10-22 16:57:47 +0000
@@ -127,10 +127,10 @@
 	#if( $status == 1 )
 		setFieldValue('selectedOrgunitText', i18n_please_select_village );
 	#elseif( $status == 2 )
-		setFieldValue('selectedOrgunitText', '$organisationUnit.name' );
+		setFieldValue('selectedOrgunitText', '$encoder.jsEncode( $organisationUnit.name )' );
 		enable('listPatientBtn');
 	#else
-		setFieldValue('selectedOrgunitText', '$organisationUnit.name' );
+		setFieldValue('selectedOrgunitText', '$encoder.jsEncode( $organisationUnit.name )' );
 		enable('listPatientBtn');
 		showById('searchDiv');
 	#end

=== modified file 'dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/sendBeneficiarySMSPage.vm'
--- dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/sendBeneficiarySMSPage.vm	2013-09-04 10:01:16 +0000
+++ dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/sendBeneficiarySMSPage.vm	2013-10-22 16:57:47 +0000
@@ -165,9 +165,9 @@
 	#if( $status == 1 )
 		setFieldValue('selectedOrgunitText', i18n_please_select_village );
 	#elseif( $status == 2 )
-		setFieldValue('selectedOrgunitText', '$organisationUnit.name' );
+		setFieldValue('selectedOrgunitText', '$encoder.jsEncode( $organisationUnit.name )' );
 	#else
-		setFieldValue('selectedOrgunitText', '$organisationUnit.name' );
+		setFieldValue('selectedOrgunitText', '$encoder.jsEncode( $organisationUnit.name )' );
 		showById('searchDiv');
 	#end	
 </script>
\ No newline at end of file