dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #25932
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 12877: Operands, missing json encoding
------------------------------------------------------------
revno: 12877
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2013-11-04 20:39:52 +0100
message:
Operands, missing json encoding
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementOperands.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-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementOperands.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementOperands.vm 2013-01-05 15:22:55 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementOperands.vm 2013-11-04 19:39:52 +0000
@@ -2,15 +2,15 @@
{ "operands": [
#foreach( $operand in $operands )
{
- "operandName": "$!{operand.operandName}",
+ "operandName": "$!encoder.jsonEncode( ${operand.operandName} )",
"dataElement": {
"id": "$!{operand.dataElement.uid}",
- "name": "$!{operand.dataElement.name}",
- "type": "$!{operand.dataElement.type}"
+ "name": "$!encoder.jsonEncode( ${operand.dataElement.name} )",
+ "type": "$!encoder.jsonEncode( ${operand.dataElement.type} )"
},
"categoryOptionCombo": {
"id": "$!{operand.categoryOptionCombo.uid}",
- "name": "$!{operand.categoryOptionCombo.name}"
+ "name": "$!encoder.jsonEncode( ${operand.categoryOptionCombo.name} )"
}
}#if( $velocityCount < $size ),#end
#end