dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 13805
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2014-01-22 11:14:39 +0200
message:
  Re-introduced F_USER_UPDATE
modified:
  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/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-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	2014-01-06 11:40:36 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties	2014-01-22 09:14:39 +0000
@@ -94,6 +94,7 @@
 F_USERGROUP_DELETE=Delete User Group
 F_USERGROUP_LIST=List User Groups
 F_USER_ADD=Add/Update User
+F_USER_UPDATE=Update User
 F_USER_DELETE=Delete User
 F_USER_VIEW=View User
 F_VALIDATIONRULE_ADD=Add/Update Validation Rule

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/struts.xml	2013-10-13 16:19:17 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/struts.xml	2014-01-22 09:14:39 +0000
@@ -62,13 +62,13 @@
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-maintenance-user/updateUserForm.vm</param>
       <param name="javascripts">javascript/user.js</param>
-      <param name="requiredAuthorities">F_USER_ADD</param>
+      <param name="anyAuthorities">F_USER_ADD,F_USER_UPDATE</param>
     </action>
 
     <action name="updateUser" class="org.hisp.dhis.user.action.UpdateUserAction">
       <result name="success" type="redirect">user.action?currentPage=${keyCurrentPage}&amp;key=${keyCurrentKey}</result>
       <result name="error" type="redirect">showUpdateUserForm.action</result>
-      <param name="requiredAuthorities">F_USER_ADD</param>
+      <param name="anyAuthorities">F_USER_ADD,F_USER_UPDATE</param>
     </action>
 
     <action name="validateUser" class="org.hisp.dhis.user.action.ValidateUserAction">