=== 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 @@
/dhis-web-maintenance-user/menu.vm
javascript/role.js,javascript/filterTable.js
../dhis-web-commons/paging/paging.css
+ F_USERROLE_LIST
/dhis-web-maintenance-user/responseRole.vm
plainTextError
+ F_USERROLE_LIST
@@ -148,7 +150,6 @@
-
/main.vm
/dhis-web-maintenance-user/deleteCurrentUser.vm
/dhis-web-maintenance-user/menu.vm
@@ -164,6 +165,7 @@
/dhis-web-maintenance-user/menu.vm
javascript/user.js
../dhis-web-commons/paging/paging.css
+ F_USER_GRUP_LIST
@@ -176,26 +178,29 @@
/dhis-web-maintenance-user/addUserGroupForm.vm
/dhis-web-maintenance-user/menu.vm
javascript/user.js
+ F_USER_GRUP_ADD
javascript/user.js
getAllUserGroups.action
+ F_USER_GRUP_ADD
/main.vm
/dhis-web-maintenance-user/updateUserGroupForm.vm
/dhis-web-maintenance-user/menu.vm
+ F_USER_GRUP_UPDATE
-
- getAllUserGroups.action
+ getAllUserGroups.action
- /dhis-web-commons/ajax/jsonResponseSuccess.vm
+ /dhis-web-commons/ajax/jsonResponseSuccess.vm
+ F_USER_GRUP_DELETE