dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #28134
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 14025: minor bugfix for categoryOptionGroupSet ajax
------------------------------------------------------------
revno: 14025
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2014-02-14 19:44:56 +0700
message:
minor bugfix for categoryOptionGroupSet ajax
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonCategoryOptionGroups.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/jsonCategoryOptionGroups.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonCategoryOptionGroups.vm 2014-02-13 12:09:31 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonCategoryOptionGroups.vm 2014-02-14 12:44:56 +0000
@@ -1,4 +1,6 @@
-{ "categoryOptionGroup":
+#set( $size = $categoryOptionGroups.size() )
+{ "categoryOptionGroups": [
+#foreach( $categoryOptionGroup in $categoryOptionGroups )
{
"id": $!{categoryOptionGroup.id},
"name": "$!encoder.jsonEncode( ${categoryOptionGroup.displayName} )",
@@ -6,4 +8,5 @@
"code": "$!encoder.jsonEncode( ${categoryOptionGroup.code} )",
"memberCount": "$categoryOptionGroup.members.size()"
}
+]#end
}