=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataSets.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataSets.vm 2012-02-05 13:27:40 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/ajax/jsonDataSets.vm 2012-02-17 19:42:53 +0000
@@ -6,8 +6,8 @@
"name": "$!encoder.jsonEncode( ${dataSet.displayName} )",
"shortName": "$!encoder.jsonEncode( ${dataSet.displayShortName} )",
"periodTypeId": "$!{dataSet.periodTypeId}",
- "version": "$!{dataSet.version}"
- #if( $dataSet.expiryDays ),"expiryDays": "$!encoder.jsonEncode( ${dataSet.expiryDays} ) #end
+ "version": "$!{dataSet.version}",
+ "expiryDays": "$!encoder.jsonEncode( ${dataSet.expiryDays} )"
}#if( $velocityCount < $size ),#end
#end
]
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties 2012-02-06 02:56:02 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties 2012-02-17 19:42:53 +0000
@@ -171,6 +171,8 @@
F_OPTIONSET_ADD=Add Option Set
F_OPTIONSET_UPDATE=Update Option Set
F_OPTIONSET_DELETE=Delete Option Set
+F_DATA_MART_ADMIN=Administrate data mart
+F_DV_ADMIN=Administrate data vizualiser
#-- User module ---------------------------------------------------------------#
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml 2012-02-13 19:27:46 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml 2012-02-17 19:42:53 +0000
@@ -275,11 +275,13 @@
/dhis-web-reporting/viewDataMartForm.vm
/dhis-web-reporting/menu.vm
javascript/dataMart.js
+ F_DATA_MART_ADMIN