=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/jsonParamsByProgram.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/jsonParamsByProgram.vm	2014-03-19 06:44:30 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/jsonParamsByProgram.vm	2014-08-07 14:14:54 +0000
@@ -1,11 +1,11 @@
 { #set( $size = $!{programStages.size()} )
   "programStages": [
-  #foreach( ${programStage} in $!{programStages} )
-  {
-	"id": "${programStage.id}",
-	"name": "$!encoder.jsonEncode( ${programStage.displayName} )"
-  }#if( $velocityCount < $size ),#end
-  #end
+	  #foreach( ${programStage} in $!{programStages} )
+	  {
+		"id": "${programStage.id}",
+		"name": "$!encoder.jsonEncode( ${programStage.displayName} )"
+	  }#if( $velocityCount < $size ),#end
+	  #end
   ],
   "attributes":[
 	#set( $size = $!{attributes.size()} )
@@ -13,7 +13,16 @@
 	{
 		"id": "[CA:${attribute.id}]",
 		"name": "$!encoder.jsonEncode( ${attribute.name} )",
-		"suggested":"$!attribute.optionSet.options"
+		"suggested":[
+			#if( $!dataElement.optionSet )
+				#foreach( $opt in $!attribute.optionSet.options )
+					{
+						"code" : $opt.code,
+						"name" : "$encoder.xmlEncode($opt.name)"
+					}#if( $velocityCount < $size ),#end
+				#end
+			#end
+		]
 	}#if( $velocityCount < $size ),#end
 	#end
   ]