dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3962
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2011-06-20 09:43:29 +0200
message:
  Added required authorities for listing userroles and user groups
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	2011-06-12 09:54:51 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties	2011-06-20 07:43:29 +0000
@@ -89,6 +89,11 @@
 F_USERROLE_ADD = Add User Role
 F_USERROLE_DELETE = Delete User Role
 F_USERROLE_UPDATE = Update User Role
+F_USERROLE_LIST = List User Roles
+F_USER_GRUP_ADD = Add User Group
+F_USER_GRUP_UPDATE = Update User Group
+F_USER_GRUP_DELETE = Delete User Group
+F_USER_GRUP_LIST = List User Groups
 F_USER_ADD = Add User
 F_USER_DELETE = Delete User
 F_USER_UPDATE = Update User

=== 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	2011-06-19 10:57:18 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/struts.xml	2011-06-20 07:43:29 +0000
@@ -98,11 +98,13 @@
       <param name="menu">/dhis-web-maintenance-user/menu.vm</param>
       <param name="javascripts">javascript/role.js,javascript/filterTable.js</param>
 	  <param name="stylesheets">../dhis-web-commons/paging/paging.css</param>
+      <param name="requiredAuthorities">F_USERROLE_LIST</param>
     </action>
     
     <action name="getRole" class="org.hisp.dhis.user.action.GetRoleAction">
       <result name="success" type="velocity-xml">/dhis-web-maintenance-user/responseRole.vm</result>
       <param name="onExceptionReturn">plainTextError</param>
+      <param name="requiredAuthorities">F_USERROLE_LIST</param>
     </action>
     
     <action name="removeRole" class="org.hisp.dhis.user.action.RemoveRoleAction">
@@ -148,7 +150,6 @@
     <!--Delete current user-->
     
     <action name="deleteCurrentUser" class="org.hisp.dhis.user.action.DeleteCurrentUserAction">
-      <!--<result name="error" type="velocity">/dhis-web-maintenance-user/responseError.vm</result>-->
       <result name="input" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-maintenance-user/deleteCurrentUser.vm</param>
       <param name="menu">/dhis-web-maintenance-user/menu.vm</param>
@@ -164,6 +165,7 @@
     <param name="menu">/dhis-web-maintenance-user/menu.vm</param>
     <param name="javascripts">javascript/user.js</param>
 	<param name="stylesheets">../dhis-web-commons/paging/paging.css</param>
+    <param name="requiredAuthorities">F_USER_GRUP_LIST</param>
   </action>
 
   <action name="getUserGroup" class="org.hisp.dhis.user.action.GetUserGroupAction">
@@ -176,26 +178,29 @@
     <param name="page">/dhis-web-maintenance-user/addUserGroupForm.vm</param>
     <param name="menu">/dhis-web-maintenance-user/menu.vm</param>
     <param name="javascripts">javascript/user.js</param>
+    <param name="requiredAuthorities">F_USER_GRUP_ADD</param>
   </action>
 
   <action name="addUserGroup" class="org.hisp.dhis.user.action.AddUserGroupAction">
     <param name="javascripts">javascript/user.js</param>
     <result name="success" type="redirect">getAllUserGroups.action</result>
+    <param name="requiredAuthorities">F_USER_GRUP_ADD</param>
   </action>
 
   <action name="editUserGroupForm" class="org.hisp.dhis.user.action.EditUserGroupFormAction">
     <result name="success" type="velocity">/main.vm</result>
     <param name="page">/dhis-web-maintenance-user/updateUserGroupForm.vm</param>
     <param name="menu">/dhis-web-maintenance-user/menu.vm</param>
+    <param name="requiredAuthorities">F_USER_GRUP_UPDATE</param>
   </action>
 
   <action name="updateUserGroup" class="org.hisp.dhis.user.action.UpdateUserGroupAction">
-    <result name="success" type="redirect">
-      getAllUserGroups.action</result>
+    <result name="success" type="redirect">getAllUserGroups.action</result>
   </action>
 
   <action name="removeUserGroup" class="org.hisp.dhis.user.action.RemoveUserGroupAction">  
-    <result name="success" type="velocity">/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>    
+    <result name="success" type="velocity">/dhis-web-commons/ajax/jsonResponseSuccess.vm</result>
+    <param name="requiredAuthorities">F_USER_GRUP_DELETE</param>  
   </action>
   
     <action name="validateUserGroup" class="org.hisp.dhis.user.action.ValidateUserGroupAction">