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
=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm 2013-10-24 08:31:35 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/patientForm.vm 2013-10-24 19:35:55 +0000
@@ -153,7 +153,7 @@
153 153
154 #foreach ($attributeGroup in $attributeGroups )154 #foreach ($attributeGroup in $attributeGroups )
155 #set($attributes = $attributesMap.get($attributeGroup.displayName))155 #set($attributes = $attributesMap.get($attributeGroup.displayName))
156 #if( $attributes && $attributes.size() == 0 )156 #if( $attributes && $attributes.size() > 0 )
157 <tr><td>&nbsp;</td></tr>157 <tr><td>&nbsp;</td></tr>
158 <tr><th colspan="2" class="heading-column">$attributeGroup.displayName</th></tr>158 <tr><th colspan="2" class="heading-column">$attributeGroup.displayName</th></tr>
159 #foreach($attribute in $attributes )159 #foreach($attribute in $attributes )
160160
=== 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-24 08:31:35 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/selectPatient.vm 2013-10-24 19:35:55 +0000
@@ -108,10 +108,6 @@
108 var i18n_comment_added = '$encoder.jsEscape( $i18n.getString( "comment_added" ) , "'")';108 var i18n_comment_added = '$encoder.jsEscape( $i18n.getString( "comment_added" ) , "'")';
109 var i18n_update = '$encoder.jsEscape( $i18n.getString( "update" ) , "'")';109 var i18n_update = '$encoder.jsEscape( $i18n.getString( "update" ) , "'")';
110 var i18n_insert_a_report_date = '$encoder.jsEscape( $i18n.getString( "insert_a_report_date" ) , "'")';110 var i18n_insert_a_report_date = '$encoder.jsEscape( $i18n.getString( "insert_a_report_date" ) , "'")';
111 var i18n_duplicate_identifier = '$encoder.jsEscape( $i18n.getString( "duplicate_identifier" ) , "'")';
112 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" ) , "'")';
113 var i18n_please_choose_representative_for_this_under_age_patient = '$encoder.jsEscape( $i18n.getString( "please_choose_representative_for_this_under_age_patient" ) , "'")';
114 var i18n_please_choose_relationshipType_for_this_under_age_patient = '$encoder.jsEscape( $i18n.getString( "please_choose_relationshipType_for_this_under_age_patient" ) , "'")';
115 111
116 var checkedDuplicate = false;112 var checkedDuplicate = false;
117 // -1: no search anything113 // -1: no search anything
@@ -131,10 +127,10 @@
131 #if( $status == 1 )127 #if( $status == 1 )
132 setFieldValue('selectedOrgunitText', i18n_please_select_village );128 setFieldValue('selectedOrgunitText', i18n_please_select_village );
133 #elseif( $status == 2 )129 #elseif( $status == 2 )
134 setFieldValue('selectedOrgunitText', '$encoder.jsEncode( $organisationUnit.name )' );130 setFieldValue('selectedOrgunitText', '$esc($organisationUnit.name)' );
135 enable('listPatientBtn');131 enable('listPatientBtn');
136 #else132 #else
137 setFieldValue('selectedOrgunitText', '$encoder.jsEncode( $organisationUnit.name )' );133 setFieldValue('selectedOrgunitText', '$esc($organisationUnit.name)' );
138 enable('listPatientBtn');134 enable('listPatientBtn');
139 showById('searchDiv');135 showById('searchDiv');
140 #end136 #end
141137
=== 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-10-22 16:57:47 +0000
+++ dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/sendBeneficiarySMSPage.vm 2013-10-24 19:35:55 +0000
@@ -165,9 +165,11 @@
165 #if( $status == 1 )165 #if( $status == 1 )
166 setFieldValue('selectedOrgunitText', i18n_please_select_village );166 setFieldValue('selectedOrgunitText', i18n_please_select_village );
167 #elseif( $status == 2 )167 #elseif( $status == 2 )
168 setFieldValue('selectedOrgunitText', '$encoder.jsEncode( $organisationUnit.name )' );168 setFieldValue('selectedOrgunitText', '$esc($organisationUnit.name)' );
169 enable('listPatientBtn');
169 #else170 #else
170 setFieldValue('selectedOrgunitText', '$encoder.jsEncode( $organisationUnit.name )' );171 setFieldValue('selectedOrgunitText', '$esc($organisationUnit.name)' );
172 enable('listPatientBtn');
171 showById('searchDiv');173 showById('searchDiv');
172 #end 174 #end
173</script>175</script>
174\ No newline at end of file176\ No newline at end of file