=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/macros.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/macros.vm	2011-09-16 15:55:47 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/macros.vm	2011-09-16 16:17:03 +0000
@@ -207,7 +207,7 @@
 </tr>
 #end
 
-#macro( trMultipleSelectInput $text $name $choices )
+#macro( trMultipleChoiceInput $text $name $choices )
 <tr>
 	<td  style="width: 200px;">$text</td>
 	<td>
@@ -241,7 +241,12 @@
 		#elseif( $attribute.valueType == "negative_integer" )
 			#trNegativeIntegerInput( $attribute.name "negativeIntegerAttribute" )
 		#elseif( $attribute.valueType == "multiple_choice" )
-			#trMultipleSelectInput( $attribute.name "multipleSelectAttribute" [ "One", "Two", "Three" ] )
+			#set( $attributeOptions = [] )
+			#foreach( $attributeOption in $attribute.attributeOptions )
+				#set( $return = $attributeOptions.add( $attributeOption.name ) )
+			#end
+
+			#trMultipleChoiceInput( $attribute.name "multipleChoiceAttribute" $attributeOptions )
 		#end
 	#end
 </table>