dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 11162
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2013-06-06 17:17:26 +0200
message:
  Tracker, fixed issue with single events without programs not loading, due to illegal json.
modified:
  dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonProgramMetaData.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/jsonProgramMetaData.vm'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonProgramMetaData.vm	2013-05-03 04:18:04 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/webapp/dhis-web-caseentry/jsonProgramMetaData.vm	2013-06-06 15:17:26 +0000
@@ -12,22 +12,22 @@
     "enrollmentDescription":"$encoder.jsonEncode( ${program.dateOfEnrollmentDescription} )",
     "incidentDescription":"$encoder.jsonEncode( ${program.dateOfIncidentDescription} )",
     "type": "$!program.type",
-    "blockEntryForm": $!program.blockEntryForm,
-    "remindCompleted": $!program.remindCompleted,
+    "blockEntryForm": $!{program.blockEntryForm},
+    "remindCompleted": $!{program.remindCompleted},
     "programStages":[#set( $pssize = $program.programStages.size() )
     #foreach( $ps in $program.programStages )
     {
         "id": "${ps.id}",
-        "uid": "$encoder.jsonEncode( $!ps.uid )",
+        "uid": "$encoder.jsonEncode( ${ps.uid} )",
         "name": "$encoder.jsonEncode( ${ps.displayName} )",
         "reportDateDescription": "$encoder.jsonEncode( ${ps.reportDateDescription} )",
-        "irregular": $!ps.irregular,
-        "displayGenerateEventBox": $!ps.displayGenerateEventBox,
-        "validCompleteOnly": $!ps.validCompleteOnly,
-        "captureCoordinates": $!ps.captureCoordinates
+        "irregular": "$!{ps.irregular}",
+        "displayGenerateEventBox": "$!{ps.displayGenerateEventBox}",
+        "validCompleteOnly": "$!{ps.validCompleteOnly}",
+        "captureCoordinates": "$!{ps.captureCoordinates}"
     }#if( $velocityCount < $pssize ),#end
     #end],
-    "programAssociations": $programAssociations.get(${program.id})
+    "programAssociations": $programAssociations.get( ${program.id} )
 }#if( $velocityCount < $psize ),#end
 #end }
 }}