DHIS

Merge lp:~dhis2-devs-core/dhis2/dcocos into lp:dhis2

  1. dcocos
  2. Merge into trunk
Proposed by Dan Cocos
Status: Needs review
Proposed branch: lp:~dhis2-devs-core/dhis2/dcocos
Merge into: lp:dhis2
Diff against target: 59 lines (+7/-9)
3 files modified
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm (+1/-1)
dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectPatient.vm (+2/-6)
dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/sendBeneficiarySMSPage.vm (+4/-2)
To merge this branch: bzr merge lp:~dhis2-devs-core/dhis2/dcocos
Reviewer Review Type Date Requested Status
Lars Helge Øverland Pending
Review via email: mp+192164@code.launchpad.net

Description of the change

When OUs have a single quote in the name they are not properly escaped in JS
This should probably be merged into 2.13 as well.

To post a comment you must log in.
lp:~dhis2-devs-core/dhis2/dcocos updated
12797. By Dan Cocos

Fixing Bug #1244389

Unmerged revisions

12797. By Dan Cocos

Fixing Bug #1244389

12796. By Dan Cocos

Escaping OU names with single quotes

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm'
2--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm 2013-10-24 08:31:35 +0000
3+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm 2013-10-24 19:35:55 +0000
4@@ -153,7 +153,7 @@
5
6 #foreach ($attributeGroup in $attributeGroups )
7 #set($attributes = $attributesMap.get($attributeGroup.displayName))
8- #if( $attributes && $attributes.size() == 0 )
9+ #if( $attributes && $attributes.size() > 0 )
10 <tr><td>&nbsp;</td></tr>
11 <tr><th colspan="2" class="heading-column">$attributeGroup.displayName</th></tr>
12 #foreach($attribute in $attributes )
13
14=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectPatient.vm'
15--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectPatient.vm 2013-10-24 08:31:35 +0000
16+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectPatient.vm 2013-10-24 19:35:55 +0000
17@@ -108,10 +108,6 @@
18 var i18n_comment_added = '$encoder.jsEscape( $i18n.getString( "comment_added" ) , "'")';
19 var i18n_update = '$encoder.jsEscape( $i18n.getString( "update" ) , "'")';
20 var i18n_insert_a_report_date = '$encoder.jsEscape( $i18n.getString( "insert_a_report_date" ) , "'")';
21- var i18n_duplicate_identifier = '$encoder.jsEscape( $i18n.getString( "duplicate_identifier" ) , "'")';
22- var i18n_this_patient_could_not_be_enrolled_please_check_validation_criteria = '$encoder.jsEscape( $i18n.getString( "this_patient_could_not_be_enrolled_please_check_validation_criteria" ) , "'")';
23- var i18n_please_choose_representative_for_this_under_age_patient = '$encoder.jsEscape( $i18n.getString( "please_choose_representative_for_this_under_age_patient" ) , "'")';
24- var i18n_please_choose_relationshipType_for_this_under_age_patient = '$encoder.jsEscape( $i18n.getString( "please_choose_relationshipType_for_this_under_age_patient" ) , "'")';
25
26 var checkedDuplicate = false;
27 // -1: no search anything
28@@ -131,10 +127,10 @@
29 #if( $status == 1 )
30 setFieldValue('selectedOrgunitText', i18n_please_select_village );
31 #elseif( $status == 2 )
32- setFieldValue('selectedOrgunitText', '$encoder.jsEncode( $organisationUnit.name )' );
33+ setFieldValue('selectedOrgunitText', '$esc($organisationUnit.name)' );
34 enable('listPatientBtn');
35 #else
36- setFieldValue('selectedOrgunitText', '$encoder.jsEncode( $organisationUnit.name )' );
37+ setFieldValue('selectedOrgunitText', '$esc($organisationUnit.name)' );
38 enable('listPatientBtn');
39 showById('searchDiv');
40 #end
41
42=== modified file 'dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/sendBeneficiarySMSPage.vm'
43--- dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/sendBeneficiarySMSPage.vm 2013-10-22 16:57:47 +0000
44+++ dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/sendBeneficiarySMSPage.vm 2013-10-24 19:35:55 +0000
45@@ -165,9 +165,11 @@
46 #if( $status == 1 )
47 setFieldValue('selectedOrgunitText', i18n_please_select_village );
48 #elseif( $status == 2 )
49- setFieldValue('selectedOrgunitText', '$encoder.jsEncode( $organisationUnit.name )' );
50+ setFieldValue('selectedOrgunitText', '$esc($organisationUnit.name)' );
51+ enable('listPatientBtn');
52 #else
53- setFieldValue('selectedOrgunitText', '$encoder.jsEncode( $organisationUnit.name )' );
54+ setFieldValue('selectedOrgunitText', '$esc($organisationUnit.name)' );
55+ enable('listPatientBtn');
56 showById('searchDiv');
57 #end
58 </script>
59\ No newline at end of file