dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 15708
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2014-06-16 22:30:48 +0200
message:
  Data entry, missing json encoding of data values
modified:
  dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/responseDataValues.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/responseDataValues.vm'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/responseDataValues.vm	2013-12-21 17:07:21 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/responseDataValues.vm	2014-06-16 20:30:48 +0000
@@ -8,7 +8,7 @@
     #else
     "id":"${value.dataElement.uid}-${value.optionCombo.uid}",
     #end
-    "val":"$!{value.value}",
+    "val":"$!encoder.jsonEncode( ${value.value} )",
     "com":"${value.hasComment()}"
   }#if( $velocityCount < $size1 ),#end
   #end ],
@@ -27,5 +27,5 @@
   "locked":${locked},
   "complete":${complete},
   "date":"$!format.formatDate( $date )",
-  "storedBy":"$!{storedBy}"
+  "storedBy":"$!encoder.jsonEncode( ${storedBy} )"
 }