dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2726
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sun 2011-01-23 03:03:01 +0100
message:
  Json encoding
modified:
  dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/responseDataSets.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-dataentry/src/main/webapp/dhis-web-dataentry/responseDataSets.vm'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/responseDataSets.vm	2010-11-18 12:28:04 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/responseDataSets.vm	2011-01-23 02:03:01 +0000
@@ -3,16 +3,16 @@
 #foreach( $dataSet in $dataSets )
   {
     "id": $!{dataSet.id},
-    "name": "$!encoder.jsEncode( ${dataSet.name} )",
-    "shortName": "$!encoder.jsEncode( ${dataSet.shortName} )",
+    "name": "$!encoder.jsonEncode( ${dataSet.name} )",
+    "shortName": "$!encoder.jsonEncode( ${dataSet.shortName} )",
     "periodTypeId": "$!{dataSet.periodTypeId}"
   }#if( $velocityCount < $size ),#end
 #end ],
   "organisationUnit":
   {
     "id": $!{organisationUnit.id},
-    "name": "$!encoder.jsEncode( ${organisationUnit.name} )",
-    "shortName": "$!encoder.jsEncode( ${organisationUnit.shortName} )"
+    "name": "$!encoder.jsonEncode( ${organisationUnit.name} )",
+    "shortName": "$!encoder.jsonEncode( ${organisationUnit.shortName} )"
   },
   "dataSetValid": ${dataSetValid},
   "periodValid": ${periodValid}