dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #19798
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 8783: Added and applied new authorities: F_MANAGE_INTEGRATION_ROUTES, F_IMPORT_DATA, F_EXPORT_DATA, F_...
------------------------------------------------------------
revno: 8783
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2012-10-31 09:45:06 +0300
message:
Added and applied new authorities: F_MANAGE_INTEGRATION_ROUTES, F_IMPORT_DATA, F_EXPORT_DATA, F_VIEW_DATABROWSER
modified:
dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-importexport/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-light/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/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-caseentry/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml 2012-10-26 09:02:41 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/resources/struts.xml 2012-10-31 06:45:06 +0000
@@ -757,6 +757,7 @@
<result name="success" type="velocity-json">
/dhis-web-caseentry/jsonminOrganisationUnitChildren.vm
</result>
+ <param name="requiredAuthorities">F_GENERATE_BENEFICIARY_TABULAR_REPORT</param>
</action>
<action name="tabularInitialize"
@@ -764,6 +765,7 @@
<result name="success" type="velocity-json">
/dhis-web-caseentry/jsonTabularInitialize.vm
</result>
+ <param name="requiredAuthorities">F_GENERATE_BENEFICIARY_TABULAR_REPORT</param>
</action>
<action name="loadPatientProperties"
@@ -771,24 +773,28 @@
<result name="success" type="velocity-json">
/dhis-web-caseentry/jsonPatientProperties.vm
</result>
+ <param name="requiredAuthorities">F_GENERATE_BENEFICIARY_TABULAR_REPORT</param>
</action>
<action name="loadReportProgramStages"
class="org.hisp.dhis.caseentry.action.report.LoadProgramStagesAction">
<result name="success" type="velocity-json">/dhis-web-caseentry/jsonProgramStages.vm
</result>
+ <param name="requiredAuthorities">F_GENERATE_BENEFICIARY_TABULAR_REPORT</param>
</action>
<action name="loadDataElements"
class="org.hisp.dhis.caseentry.action.report.LoadDataElementsAction">
<result name="success" type="velocity-json">/dhis-web-caseentry/responseDataElements.vm
</result>
+ <param name="requiredAuthorities">F_GENERATE_BENEFICIARY_TABULAR_REPORT</param>
</action>
<action name="getTabularParams"
class="org.hisp.dhis.caseentry.action.report.GetTabularParamsAction">
<result name="success" type="velocity-json">/dhis-web-caseentry/responseTabularParams.vm
</result>
+ <param name="requiredAuthorities">F_GENERATE_BENEFICIARY_TABULAR_REPORT</param>
</action>
<action name="validateTabularReport"
@@ -799,6 +805,7 @@
<result name="input" type="velocity-json">
/dhis-web-commons/ajax/jsonResponseInput.vm
</result>
+ <param name="requiredAuthorities">F_GENERATE_BENEFICIARY_TABULAR_REPORT</param>
</action>
<action name="generateTabularReport"
@@ -815,6 +822,7 @@
<result name="success" type="velocity-json">
/dhis-web-commons/ajax/jsonResponseSuccess.vm
</result>
+ <param name="requiredAuthorities">F_GENERATE_BENEFICIARY_TABULAR_REPORT</param>
</action>
<action name="getTabularReports"
@@ -822,6 +830,7 @@
<result name="success" type="velocity-json">
/dhis-web-caseentry/jsonTabularReportList.vm
</result>
+ <param name="requiredAuthorities">F_GENERATE_BENEFICIARY_TABULAR_REPORT</param>
</action>
<action name="getTabularReport"
@@ -829,6 +838,7 @@
<result name="success" type="velocity-json">
/dhis-web-caseentry/jsonTabularReport.vm
</result>
+ <param name="requiredAuthorities">F_GENERATE_BENEFICIARY_TABULAR_REPORT</param>
</action>
<action name="updateTabularReportName"
@@ -836,6 +846,7 @@
<result name="success" type="velocity-json">
/dhis-web-commons/ajax/jsonResponseSuccess.vm
</result>
+ <param name="requiredAuthorities">F_GENERATE_BENEFICIARY_TABULAR_REPORT</param>
</action>
<action name="deleteTabularReport"
@@ -843,6 +854,7 @@
<result name="success" type="velocity-json">
/dhis-web-commons/ajax/jsonResponseSuccess.vm
</result>
+ <param name="requiredAuthorities">F_GENERATE_BENEFICIARY_TABULAR_REPORT</param>
</action>
<!-- SMS Reminder -->
@@ -868,6 +880,7 @@
<result name="success" type="velocity">/content.vm</result>
<param name="page">/dhis-web-caseentry/programTrackingRecords.vm</param>
<param name="stylesheets">style/style.css</param>
+ <param name="requiredAuthorities">F_SMS_REMINDER</param>
</action>
<action name="programTrackingList"
@@ -883,6 +896,7 @@
<result name="input" type="velocity-json">/dhis-web-commons/ajax/jsonResponseInput.vm</result>
<result name="error" type="velocity-json">/dhis-web-commons/ajax/jsonResponseError.vm</result>
<param name="onExceptionReturn">plainTextError</param>
+ <param name="requiredAuthorities">F_SMS_REMINDER</param>
</action>
<action name="sendSMSTotList"
@@ -892,6 +906,7 @@
<result name="error" type="velocity-json">/dhis-web-commons/ajax/jsonResponseError.vm
</result>
<param name="onExceptionReturn">plainTextError</param>
+ <param name="requiredAuthorities">F_SMS_REMINDER</param>
</action>
<action name="patientProgramTracking"
@@ -953,12 +968,14 @@
<result name="success" type="velocity">/content.vm</result>
<param name="page">/dhis-web-caseentry/activityPlanRecords.vm</param>
<param name="stylesheets">style/style.css</param>
+ <param name="requiredAuthorities">F_ACTIVITY_PLAN</param>
</action>
<action name="exportActitityList"
class="org.hisp.dhis.caseentry.action.caseentry.GetDataRecordsAction">
<result name="xls" type="gridXlsResult" />
<result name="pdf" type="gridPdfResult" />
+ <param name="requiredAuthorities">F_ACTIVITY_PLAN</param>
</action>
</package>
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/struts.xml 2012-09-19 16:14:28 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/struts.xml 2012-10-31 06:45:06 +0000
@@ -66,10 +66,12 @@
<action name="registerCompleteDataSet" class="org.hisp.dhis.de.action.RegisterCompleteDataSetAction">
<result name="success" type="velocity-json">../dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
<result name="input" type="velocity-json">../dhis-web-commons/ajax/jsonResponseInput.vm</result>
+ <param name="requiredAuthorities">F_DATAVALUE_ADD</param>
</action>
<action name="undoCompleteDataSet" class="org.hisp.dhis.de.action.UndoCompleteDataSetAction">
<result name="success" type="velocity-json">../dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
+ <param name="requiredAuthorities">F_DATAVALUE_DELETE</param>
</action>
<action name="getValidationViolations" class="org.hisp.dhis.de.action.ValidationAction">
=== 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 2012-07-30 10:02:43 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/resources/struts.xml 2012-10-31 06:45:06 +0000
@@ -21,16 +21,19 @@
<param name="page">/dhis-web-importexport/importDataValue.vm</param>
<param name="menu">/dhis-web-importexport/mainMenu.vm</param>
<param name="javascripts">javascript/importDataValue.js</param>
+ <param name="requiredAuthorities">F_IMPORT_DATA</param>
</action>
<action name="importDataValue" class="org.hisp.dhis.importexport.action.datavalue.ImportDataValueAction">
<result name="success" type="redirect">displayImportDataValueForm.action?running=true&importFormat=${importFormat}</result>
<interceptor-ref name="fileUploadStack" />
+ <param name="requiredAuthorities">F_IMPORT_DATA</param>
</action>
<action name="getDataValueImportSummary" class="org.hisp.dhis.importexport.action.GetImportSummaryAction">
<result name="success" type="velocity">/dhis-web-importexport/importSummary.vm</result>
<param name="onExceptionReturn">plainTextError</param>
+ <param name="requiredAuthorities">F_IMPORT_DATA</param>
</action>
<!-- Data value export -->
@@ -40,10 +43,12 @@
<param name="page">/dhis-web-importexport/exportDataValueForm.vm</param>
<param name="menu">/dhis-web-importexport/mainMenu.vm</param>
<param name="javascripts">../dhis-web-commons/oust/oust.js,javascript/export.js</param>
+ <param name="requiredAuthorities">F_EXPORT_DATA</param>
</action>
<action name="exportDataValue" class="org.hisp.dhis.importexport.action.datavalue.ExportDataValueAction">
<result name="success" type="outputStreamResult" />
+ <param name="requiredAuthorities">F_EXPORT_DATA</param>
</action>
<!-- Menu -->
@@ -52,12 +57,14 @@
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-importexport/externalImportMenu.vm</param>
<param name="menu">/dhis-web-importexport/mainMenu.vm</param>
+ <param name="requiredAuthorities">F_IMPORT_DATA</param>
</action>
<action name="displayExternalExportMenu" class="org.hisp.dhis.importexport.action.NoAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-importexport/externalExportMenu.vm</param>
<param name="menu">/dhis-web-importexport/mainMenu.vm</param>
+ <param name="requiredAuthorities">F_EXPORT_DATA</param>
</action>
<!-- Import -->
@@ -73,6 +80,7 @@
<param name="page">/dhis-web-importexport/importForm.vm</param>
<param name="menu">/dhis-web-importexport/mainMenu.vm</param>
<param name="javascripts">javascript/import.js,javascript/process.js</param>
+ <param name="requiredAuthorities">F_IMPORT_DATA</param>
</action>
<action name="import" class="org.hisp.dhis.importexport.action.imp.ImportAction">
@@ -82,17 +90,20 @@
<param name="menu">/dhis-web-importexport/mainMenu.vm</param>
<param name="javascripts">javascript/import.js,javascript/process.js</param>
<interceptor-ref name="fileUploadStack" />
+ <param name="requiredAuthorities">F_IMPORT_DATA</param>
</action>
<action name="getImportStatus" class="org.hisp.dhis.importexport.action.imp.GetImportStatusAction">
<result name="success" type="velocity-xml">/dhis-web-importexport/responseImportStatus.vm</result>
<param name="onExceptionReturn">plainTextError</param>
+ <param name="requiredAuthorities">F_IMPORT_DATA</param>
</action>
<action name="getImportAnalysis" class="org.hisp.dhis.importexport.action.imp.GetImportAnalysisAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-importexport/importAnalysisForm.vm</param>
<param name="menu">/dhis-web-importexport/mainMenu.vm</param>
+ <param name="requiredAuthorities">F_IMPORT_DATA</param>
</action>
<!-- Object Ajax -->
@@ -101,12 +112,14 @@
<result name="success" type="velocity-xml">/dhis-web-importexport/responseSuccess.vm</result>
<result name="error" type="velocity-xml">/dhis-web-importexport/responseError.vm</result>
<param name="onExceptionReturn">plainTextError</param>
+ <param name="requiredAuthorities">F_IMPORT_DATA</param>
</action>
<action name="discardObjectsOfTypeAjax" class="org.hisp.dhis.importexport.action.object.DiscardObjectsOfTypeAction">
<result name="success" type="velocity-xml">/dhis-web-importexport/responseSuccess.vm</result>
<result name="error" type="velocity-xml">/dhis-web-importexport/responseError.vm</result>
<param name="onExceptionReturn">plainTextError</param>
+ <param name="requiredAuthorities">F_IMPORT_DATA</param>
</action>
<!-- Preview -->
@@ -116,6 +129,7 @@
<param name="page">/dhis-web-importexport/previewForm.vm</param>
<param name="menu">/dhis-web-importexport/mainMenu.vm</param>
<param name="javascripts">javascript/import.js</param>
+ <param name="requiredAuthorities">F_IMPORT_DATA</param>
</action>
<action name="displayMatchForm" class="org.hisp.dhis.importexport.action.imp.GetMatchOptionsAction">
@@ -123,6 +137,7 @@
<param name="page">/dhis-web-importexport/matchToExistingForm.vm</param>
<param name="menu">/dhis-web-importexport/mainMenu.vm</param>
<param name="javascripts">javascript/import.js</param>
+ <param name="requiredAuthorities">F_IMPORT_DATA</param>
</action>
<action name="displayCompareForm" class="org.hisp.dhis.importexport.action.imp.GetCompareOptionsAction">
@@ -130,14 +145,17 @@
<param name="page">/dhis-web-importexport/compareToExistingForm.vm</param>
<param name="menu">/dhis-web-importexport/mainMenu.vm</param>
<param name="javascripts">javascript/import.js</param>
+ <param name="requiredAuthorities">F_IMPORT_DATA</param>
</action>
<action name="importAllObjects" class="org.hisp.dhis.importexport.action.object.ImportAllObjectsAction">
<result name="success" type="redirect">displayImportForm.action</result>
+ <param name="requiredAuthorities">F_IMPORT_DATA</param>
</action>
<action name="discardAllObjects" class="org.hisp.dhis.importexport.action.object.DiscardAllObjectsAction">
<result name="success" type="redirect">displayImportForm.action</result>
+ <param name="requiredAuthorities">F_IMPORT_DATA</param>
</action>
<action name="matchObject" class="org.hisp.dhis.importexport.action.object.MatchObjectAction">
@@ -145,6 +163,7 @@
<param name="page">/dhis-web-importexport/previewForm.vm</param>
<param name="menu">/dhis-web-importexport/mainMenu.vm</param>
<param name="javascripts">javascript/import.js</param>
+ <param name="requiredAuthorities">F_IMPORT_DATA</param>
</action>
<action name="discardObject" class="org.hisp.dhis.importexport.action.object.DiscardObjectAction">
@@ -152,6 +171,7 @@
<param name="page">/dhis-web-importexport/previewForm.vm</param>
<param name="menu">/dhis-web-importexport/mainMenu.vm</param>
<param name="javascripts">javascript/import.js</param>
+ <param name="requiredAuthorities">F_IMPORT_DATA</param>
</action>
<!-- Export -->
@@ -161,6 +181,7 @@
<param name="page">/dhis-web-importexport/exportMetaDataForm.vm</param>
<param name="menu">/dhis-web-importexport/mainMenu.vm</param>
<param name="javascripts">javascript/export.js</param>
+ <param name="requiredAuthorities">F_EXPORT_DATA</param>
</action>
<action name="displayDetailedMetaDataExportForm"
@@ -169,6 +190,7 @@
<param name="page">/dhis-web-importexport/exportDetailedMetaDataForm.vm</param>
<param name="menu">/dhis-web-importexport/mainMenu.vm</param>
<param name="javascripts">javascript/detailedExport.js</param>
+ <param name="requiredAuthorities">F_EXPORT_DATA</param>
</action>
<action name="exportMetaData" class="org.hisp.dhis.importexport.action.exp.MetaDataExportAction">
@@ -177,6 +199,7 @@
<param name="inputName">inputStream</param>
<param name="contentDisposition">filename="${fileName}"</param>
<param name="bufferSize">10240</param>
+ <param name="requiredAuthorities">F_EXPORT_DATA</param>
</result>
</action>
@@ -186,6 +209,7 @@
<param name="inputName">inputStream</param>
<param name="contentDisposition">filename="${fileName}"</param>
<param name="bufferSize">10240</param>
+ <param name="requiredAuthorities">F_EXPORT_DATA</param>
</result>
</action>
@@ -204,6 +228,7 @@
<result name="success" type="velocity-xml">/dhis-web-importexport/responseSuccess.vm</result>
<result name="error" type="velocity-xml">/dhis-web-importexport/responseError.vm</result>
<param name="onExceptionReturn">plainTextError</param>
+ <param name="requiredAuthorities">F_EXPORT_DATA</param>
</action>
<!-- Dhis 1.4 Configuration -->
@@ -214,6 +239,7 @@
<param name="page">/dhis-web-importexport/configDhis14Form.vm</param>
<param name="menu">/dhis-web-importexport/mainMenu.vm</param>
<param name="javascripts">javascript/config.js</param>
+ <param name="requiredAuthorities">F_IMPORT_DATA</param>
</action>
<action name="configDhis14" class="org.hisp.dhis.importexport.action.dhis14.SetDhis14ConfigurationAction">
@@ -226,20 +252,6 @@
<result name="input" type="velocity-xml">/dhis-web-importexport/responseInput.vm</result>
</action>
- <action name="showAddRouteForm" class="org.hisp.dhis.importexport.action.integration.ShowAddRouteFormAction">
- <result name="success" type="velocity">/main.vm</result>
- <param name="page">/dhis-web-importexport/showAddRouteForm.vm</param>
- <param name="menu">/dhis-web-importexport/mainMenu.vm</param>
- <param name="javascripts" />
- </action>
-
- <action name="addRoute" class="org.hisp.dhis.importexport.action.integration.AddRouteAction">
- <result name="success" type="redirect">displayRoutes.action</result>
- <result name="error" type="redirect">showAddRouteForm.action</result>
- <interceptor-ref name="fileUploadStack" />
- <param name="javascripts" />
- </action>
-
<!-- DXF2 MetaData import/export -->
<action name="dxf2MetaDataImport" class="org.hisp.dhis.importexport.action.dxf2.MetaDataImportFormAction">
@@ -268,15 +280,30 @@
<!-- Camel configuration -->
+ <action name="showAddRouteForm" class="org.hisp.dhis.importexport.action.integration.ShowAddRouteFormAction">
+ <result name="success" type="velocity">/main.vm</result>
+ <param name="page">/dhis-web-importexport/showAddRouteForm.vm</param>
+ <param name="menu">/dhis-web-importexport/mainMenu.vm</param>
+ <param name="requiredAuthorities">F_MANAGE_INTEGRATION_ROUTES</param>
+ </action>
+
+ <action name="addRoute" class="org.hisp.dhis.importexport.action.integration.AddRouteAction">
+ <result name="success" type="redirect">displayRoutes.action</result>
+ <result name="error" type="redirect">showAddRouteForm.action</result>
+ <interceptor-ref name="fileUploadStack" />
+ <param name="requiredAuthorities">F_MANAGE_INTEGRATION_ROUTES</param>
+ </action>
+
<action name="displayRoutes" class="org.hisp.dhis.importexport.action.integration.DisplayRoutesAction">
<result name="success" type="velocity">/main.vm</result>
<param name="page">/dhis-web-importexport/displayRoutes.vm</param>
<param name="menu">/dhis-web-importexport/mainMenu.vm</param>
- <param name="javascripts" />
+ <param name="requiredAuthorities">F_MANAGE_INTEGRATION_ROUTES</param>
</action>
<action name="routeOperation" class="org.hisp.dhis.importexport.action.integration.RouteOperationAction">
- <result name="success" type="redirect">displayRoutes.action</result>
+ <result name="success" type="redirect">displayRoutes.action</result>
+ <param name="requiredAuthorities">F_MANAGE_INTEGRATION_ROUTES</param>
</action>
</package>
=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-light/src/main/resources/struts.xml 2012-10-29 03:48:40 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/resources/struts.xml 2012-10-31 06:45:06 +0000
@@ -70,6 +70,7 @@
<result name="success" type="redirect">
/light/index.action?organisationUnitId=${organisationUnitId}&dataSetId=${dataSetId}&periodId=${periodId}&complete=true
</result>
+ <param name="requiredAuthorities">F_DATAVALUE_ADD</param>
</action>
<action name="inComplete"
@@ -77,6 +78,7 @@
<result name="success" type="redirect">
/light/dataEntry.action?organisationUnitId=${organisationUnitId}&dataSetId=${dataSetId}&periodId=${periodId}
</result>
+ <param name="requiredAuthorities">F_DATAVALUE_DELETE</param>
</action>
<!-- Namebased Data Entry -->
@@ -84,7 +86,6 @@
<action name="trackingMenu" class="org.hisp.dhis.light.action.NoAction">
<result name="success" type="velocity">/dhis-web-light/main.vm</result>
<param name="page">/dhis-web-light/trackingMenu.vm</param>
- <param name="requiredAuthorities">M_dhis-web-maintenance-patient</param>
</action>
<action name="selectNamebasedOrganisationUnit"
class="org.hisp.dhis.light.namebaseddataentry.action.GetNamebasedOrganisationUnitsAction">
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml 2012-07-25 13:18:48 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/resources/struts.xml 2012-10-31 06:45:06 +0000
@@ -103,6 +103,7 @@
<param name="javascripts"> ../dhis-web-commons/oust/oust.js,
javascript/dataBrowser.js,
javascript/dataBrowserForm.js</param>
+ <param name="requiredAuthorities">F_VIEW_DATABROWSER</param>
</action>
<action name="searchResult" class="org.hisp.dhis.dataadmin.action.databrowser.DataBrowserAction">
@@ -112,6 +113,7 @@
/dhis-web-maintenance-dataadmin/dataBrowserResult.vm</param>
<param name="menu">/dhis-web-maintenance-dataadmin/menu.vm</param>
<param name="javascripts">javascript/dataBrowser.js</param>
+ <param name="requiredAuthorities">F_VIEW_DATABROWSER</param>
</action>
<action name="searchResultByAjax" class="org.hisp.dhis.dataadmin.action.databrowser.DataBrowserAction">
@@ -130,6 +132,7 @@
<result name="csv" type="gridCsvResult" />
<result name="xls" type="gridXlsResult" />
<result name="pdf" type="gridPdfResult" />
+ <param name="requiredAuthorities">F_VIEW_DATABROWSER</param>
</action>
<!-- Organisation unit merge -->
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml 2012-10-23 10:26:43 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/struts.xml 2012-10-31 06:45:06 +0000
@@ -87,22 +87,27 @@
<param name="page">/dhis-web-maintenance-datadictionary/dataElementGroupEditorView.vm</param>
<param name="menu">/dhis-web-maintenance-datadictionary/menu.vm</param>
<param name="javascripts">javascript/dataElementGroupEditorView.js</param>
+ <param name="requiredAuthorities">F_DATAELEMENTGROUP_UPDATE</param>
</action>
<action name="getAssignedDataElementGroups" class="org.hisp.dhis.dd.action.dataelementgroup.GetAssignedGroupsByDataElementAction">
<result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonDataElementGroups.vm</result>
+ <param name="requiredAuthorities">F_DATAELEMENTGROUP_UPDATE</param>
</action>
<action name="asignGroupsForDataElement" class="org.hisp.dhis.dd.action.dataelementgroup.AssignGroupsForDataElementAction">
<result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
+ <param name="requiredAuthorities">F_DATAELEMENTGROUP_UPDATE</param>
</action>
<action name="addDataElementGroupEditor" class="org.hisp.dhis.dd.action.dataelementgroup.AddDataElementGroupAction">
<result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonDataElementGroup.vm</result>
+ <param name="requiredAuthorities">F_DATAELEMENTGROUP_UPDATE</param>
</action>
<action name="renameDataElementGroupEditor" class="org.hisp.dhis.dd.action.dataelementgroup.RenameDEGroupNameEditorAction">
<result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonDataElementGroup.vm</result>
+ <param name="requiredAuthorities">F_DATAELEMENTGROUP_UPDATE</param>
</action>
<action name="deleteDataElemenGroupEditor" class="org.hisp.dhis.dd.action.dataelementgroup.RemoveDataElementGroupAction">
@@ -113,10 +118,12 @@
/dhis-web-commons/ajax/jsonResponseError.vm
</result>
<param name="onExceptionReturn">plainTextError</param>
+ <param name="requiredAuthorities">F_DATAELEMENTGROUP_DELETE</param>
</action>
<action name="updateDataElementGroupEditor" class="org.hisp.dhis.dd.action.dataelementgroup.UpdateDataElementGroupAction">
<result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
+ <param name="requiredAuthorities">F_DATAELEMENTGROUP_UPDATE</param>
</action>
<!-- DataElementGroup -->
@@ -300,22 +307,27 @@
<param name="page">/dhis-web-maintenance-datadictionary/indicatorGroupEditorView.vm</param>
<param name="menu">/dhis-web-maintenance-datadictionary/menu.vm</param>
<param name="javascripts">javascript/indicatorGroupEditorView.js</param>
+ <param name="requiredAuthorities">F_INDICATORGROUP_UPDATE</param>
</action>
<action name="getAssignedIndicatorGroups" class="org.hisp.dhis.dd.action.indicatorgroup.GetAssignedIndicatorGroupsAction">
<result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonIndicatorGroups.vm</result>
+ <param name="requiredAuthorities">F_INDICATORGROUP_UPDATE</param>
</action>
<action name="asignGroupsForIndicator" class="org.hisp.dhis.dd.action.indicatorgroup.AssignGroupsForIndicatorAction">
<result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
+ <param name="requiredAuthorities">F_INDICATORGROUP_UPDATE</param>
</action>
<action name="addIndicatorGroupEditor" class="org.hisp.dhis.dd.action.indicatorgroup.AddIndicatorGroupAction">
<result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonIndicatorGroup.vm</result>
+ <param name="requiredAuthorities">F_INDICATORGROUP_UPDATE</param>
</action>
<action name="renameIndicatorGroupEditor" class="org.hisp.dhis.dd.action.indicatorgroup.RenameIndicatorGroupNameEditorAction">
<result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonIndicatorGroup.vm</result>
+ <param name="requiredAuthorities">F_INDICATORGROUP_UPDATE</param>
</action>
<action name="deleteIndicatorGroupEditor" class="org.hisp.dhis.dd.action.indicatorgroup.RemoveIndicatorGroupAction">
@@ -326,10 +338,12 @@
/dhis-web-commons/ajax/jsonResponseError.vm
</result>
<param name="onExceptionReturn">plainTextError</param>
+ <param name="requiredAuthorities">F_INDICATORGROUP_DELETE</param>
</action>
<action name="updateIndicatorGroupEditor" class="org.hisp.dhis.dd.action.indicatorgroup.UpdateIndicatorGroupAction">
<result name="success" type="velocity-json">/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
+ <param name="requiredAuthorities">F_INDICATORGROUP_UPDATE</param>
</action>
<!-- IndicatorGroup -->
=== 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-10-23 13:15:16 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties 2012-10-31 06:45:06 +0000
@@ -208,6 +208,10 @@
F_ATTRIBUTE_ADD=Add Attribute
F_ATTRIBUTE_DELETE=Delete Attribute
F_ATTRIBUTE_UPDATE=Update Attribute
+F_MANAGE_INTEGRATION_ROUTES=Manage integration routes
+F_IMPORT_DATA=Import data
+F_EXPORT_DATA=Export data
+F_VIEW_DATABROWSER=View data browser
#-- User module ---------------------------------------------------------------#
