dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 7274
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-06-12 11:08:11 +0700
message:
  Display Unicode characters when to edit and save data values on grid in tabular report.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularReportResult.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/app/app.js'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js	2012-06-12 03:38:24 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/app/app.js	2012-06-12 04:08:11 +0000
@@ -54,7 +54,6 @@
 			favorite_save: 'saveTabularReport.action',
             favorite_delete: 'deleteTabularReport.action',
 			datavalue_save: 'saveValue.action',
-			datavalue_view: 'viewRecord.action',
 			datavalue_delete: 'removeCurrentEncounter.action',
             redirect: 'index.action'
         },
@@ -1118,7 +1117,7 @@
 				params += '&dataElementId=' + deId;
 				params += '&value=' ;
 			if( value != '')
-				params += value;
+				params += encodeURIComponent(value);
 			
 			Ext.Ajax.request({
 				url: TR.conf.finals.ajax.path_commons + TR.conf.finals.ajax.datavalue_save,

=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularReportResult.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularReportResult.vm	2012-05-31 10:17:58 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonTabularReportResult.vm	2012-06-12 04:08:11 +0000
@@ -33,7 +33,7 @@
   [
     #foreach( $col in $row )
 	#set($colName = "col"+ $velocityCount)
-    "$!encoder.htmlEncode( $col )"#if( $velocityCount < $noHeader ),#end
+    "$!col"#if( $velocityCount < $noHeader ),#end
     #end
   ]#if( $velocityCount < $noRows ),#end
   #end