dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 10378
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Thu 2013-03-21 12:09:47 +0100
message:
  Setting correct authorities for seeing the meta-data import and export pages 
modified:
  dhis-2/dhis-web/dhis-web-importexport/src/main/resources/struts.xml
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties


--
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-importexport/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/resources/struts.xml	2013-03-15 15:34:40 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/resources/struts.xml	2013-03-21 11:09:47 +0000
@@ -259,13 +259,14 @@
       <param name="menu">/dhis-web-importexport/mainMenu.vm</param>
       <param name="page">/dhis-web-importexport/dxf2MetaDataImport.vm</param>
       <param name="javascripts">javascript/importMetaData.js</param>
+      <param name="requiredAuthorities">F_METADATA_IMPORT</param>
     </action>
 
     <action name="dxf2MetaDataExport" class="org.hisp.dhis.importexport.action.dxf2.MetaDataExportFormAction">
       <result name="success" type="velocity">/main.vm</result>
       <param name="menu">/dhis-web-importexport/mainMenu.vm</param>
       <param name="page">/dhis-web-importexport/dxf2MetaDataExport.vm</param>
-      <param name="javascripts" />
+      <param name="requiredAuthorities">F_METADATA_EXPORT</param>
     </action>
 
     <action name="importMetaData" class="org.hisp.dhis.importexport.action.dxf2.MetaDataImportAction">

=== 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-03-16 11:06:47 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties	2013-03-21 11:09:47 +0000
@@ -250,6 +250,14 @@
 F_RUN_VALIDATION=Run validation
 F_PROGRAM_TRACKING_LIST=View program tracking
 F_MYDATAMART_VIEW=Access my data mart
+F_METADATA_EXPORT=Export Meta-Data
+F_METADATA_IMPORT=Import Meta-Data
+
+#-- FRED API module -----------------------------------------------------------#
+
+F_FRED_CREATE=Add Facility
+F_FRED_UPDATE=Update Facility
+F_FRED_DELETE=Delete Facility
 
 #-- User module ---------------------------------------------------------------#
 
@@ -305,11 +313,3 @@
 disabled=Disabled
 disable=Disable
 enable=Enable
-
-#-- FRED API module ---------------------------------------------------------------#
-F_FRED_CREATE=Add Facility
-F_FRED_UPDATE=Update Facility
-F_FRED_DELETE=Delete Facility
-
-F_METADATA_EXPORT=Export MetaData
-F_METADATA_IMPORT=Import MetaData