------------------------------------------------------------
revno: 13461
committer: Lars Helge Øverland <[email protected]>
branch nick: dhis2
timestamp: Sun 2013-12-29 16:16:57 +0100
message:
Added approval auths
modified:
dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/security.xml
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-reporting/src/main/resources/struts.xml
--
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/src/main/resources/META-INF/dhis/security.xml'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/security.xml 2013-12-19 11:50:58 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/security.xml 2013-12-29 15:16:57 +0000
@@ -281,6 +281,8 @@
<value>F_METADATA_IMPORT</value>
<value>F_METADATA_SUBSET_IMPORT</value>
<value>F_METADATA_SUBSET_EXPORT</value>
+ <value>F_APPROVE_DATA</value>
+ <value>F_APPROVE_DATA_LOWER_LEVELS</value>
</set>
</property>
</bean>
=== 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 2013-10-16 14:02:04 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties 2013-12-29 15:16:57 +0000
@@ -228,6 +228,10 @@
F_MANAGE_INTEGRATION_ROUTES=Manage integration routes
F_IMPORT_DATA=Import data
F_EXPORT_DATA=Export data
+F_METADATA_SUBSET_IMPORT=Import sub-set of meta-data
+F_METADATA_SUBSET_EXPORT=Export sub-set of meta-data
+F_APPROVE_DATA=Approve data
+F_APPROVE_DATA_LOWER_LEVELS=Approve data at lower levels
F_VIEW_DATABROWSER=View data browser
F_RUN_VALIDATION=Run validation
F_PROGRAM_TRACKING_LIST=View program tracking
=== 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 2013-10-22 10:29:16 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/resources/struts.xml 2013-12-29 15:16:57 +0000
@@ -13,7 +13,7 @@
<param name="page">/dhis-web-reporting/index.vm</param>
<param name="menu">/dhis-web-reporting/menu.vm</param>
</action>
-
+
<!-- Document -->
<action name="saveDocument" class="org.hisp.dhis.reporting.document.action.SaveDocumentAction">
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
