------------------------------------------------------------
revno: 15657
committer: Lars Helge Overland <larshe...@gmail.com>
branch nick: dhis2
timestamp: Thu 2014-06-12 18:38:27 +0200
message:
Minor
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementCategory.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementCategoryOption.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementGroupSet.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/jsonDataElementCategory.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementCategory.vm 2014-06-12 16:08:03 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementCategory.vm 2014-06-12 16:38:27 +0000
@@ -1,7 +1,7 @@
{ "dataElementCategory":
{
- "id": "${dataElementCategory.id}" ,
- "uid": "${dataElementCategory.uid}" ,
+ "id": "${dataElementCategory.id}",
+ "uid": "${dataElementCategory.uid}",
"name": "$!encoder.jsonEncode( ${dataElementCategory.name} )",
"categoryOptionCount": "${dataElementCategory.categoryOptions.size()}"
}
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementCategoryOption.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementCategoryOption.vm 2014-06-12 16:08:03 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementCategoryOption.vm 2014-06-12 16:38:27 +0000
@@ -1,7 +1,7 @@
{ "dataElementCategoryOption":
{
- "id": "${dataElementCategoryOption.id}" ,
- "uid": "${dataElementCategoryOption.uid}" ,
+ "id": "${dataElementCategoryOption.id}",
+ "uid": "${dataElementCategoryOption.uid}",
"name": "$!encoder.jsonEncode( ${dataElementCategoryOption.name} )",
"startDate": "$!format.formatDate( ${dataElementCategoryOption.startDate} )",
"endDate": "$!format.formatDate( ${dataElementCategoryOption.endDate} )",
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementGroupSet.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementGroupSet.vm 2014-06-12 16:08:03 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataElementGroupSet.vm 2014-06-12 16:38:27 +0000
@@ -1,7 +1,7 @@
{ "dataElementGroupSet":
{
- "id": "${dataElementGroupSet.id}" ,
- "uid": "${dataElementGroupSet.uid}" ,
+ "id": "${dataElementGroupSet.id}",
+ "uid": "${dataElementGroupSet.uid}",
"name": "$!encoder.jsonEncode( ${dataElementGroupSet.displayName} )",
"memberCount": "$dataElementGroupSet.members.size()"
}
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
