dhis2-devs team mailing list archive

Thread
Date

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 9655: sharing for usergroup (wip), renamed usergroup authorities (USER_GRUP => USERGROUP)

To: DHIS 2 developers <dhis2-devs@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Wed, 30 Jan 2013 04:57:15 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 9655
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-01-30 11:56:16 +0700
message:
  sharing for usergroup (wip), renamed usergroup authorities (USER_GRUP => USERGROUP)
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/SharingUtils.java
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java
  dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/user/hibernate/UserGroup.hbm.xml
  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_es_ES.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_fr_FR.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_my_MM.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_pt_PT.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_vi_VN.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_zh_CN.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-api/src/main/java/org/hisp/dhis/common/SharingUtils.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/SharingUtils.java	2013-01-30 03:20:49 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/SharingUtils.java	2013-01-30 04:56:16 +0000
@@ -39,6 +39,7 @@
 import org.hisp.dhis.report.Report;
 import org.hisp.dhis.reporttable.ReportTable;
 import org.hisp.dhis.user.User;
+import org.hisp.dhis.user.UserGroup;
 import org.hisp.dhis.user.UserGroupAccess;
 
 import java.util.HashMap;
@@ -104,6 +105,10 @@
         SUPPORTED_TYPES.put( "indicatorGroupSet", IndicatorGroupSet.class );
         PUBLIC_AUTHORITIES.put( IndicatorGroupSet.class, "F_INDICATORGROUPSET_PUBLIC_ADD" );
         PRIVATE_AUTHORITIES.put( IndicatorGroupSet.class, "F_INDICATORGROUPSET_PRIVATE_ADD" );
+
+        SUPPORTED_TYPES.put( "userGroup", UserGroup.class );
+        PUBLIC_AUTHORITIES.put( UserGroup.class, "F_USERGROUP_PUBLIC_ADD" );
+        PRIVATE_AUTHORITIES.put( UserGroup.class, "F_USERGROUP_PRIVATE_ADD" );
     }
 
     public static boolean isSupported( String type )

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java	2013-01-30 03:20:49 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java	2013-01-30 04:56:16 +0000
@@ -497,6 +497,11 @@
         executeSql( "UPDATE userroleauthorities SET authority='F_INDICATORGROUP_PUBLIC_ADD' WHERE authority='F_INDICATORGROUP_ADD'" );
         executeSql( "UPDATE userroleauthorities SET authority='F_INDICATORGROUPSET_PUBLIC_ADD' WHERE authority='F_INDICATORGROUPSET_ADD'" );
 
+        executeSql( "UPDATE userroleauthorities SET authority='F_USERGROUP_PUBLIC_ADD' WHERE authority='F_USER_GRUP_ADD'" );
+        executeSql( "UPDATE userroleauthorities SET authority='F_USERGROUP_UPDATE' WHERE authority='F_USER_GRUP_UPDATE'" );
+        executeSql( "UPDATE userroleauthorities SET authority='F_USERGROUP_DELETE' WHERE authority='F_USER_GRUP_DELETE'" );
+        executeSql( "UPDATE userroleauthorities SET authority='F_USERGROUP_LIST' WHERE authority='F_USER_GRUP_LIST'" );
+
         log.info( "Tables updated" );
     }
 

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/user/hibernate/UserGroup.hbm.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/user/hibernate/UserGroup.hbm.xml	2012-06-01 11:35:55 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/user/hibernate/UserGroup.hbm.xml	2013-01-30 04:56:16 +0000
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <!DOCTYPE hibernate-mapping PUBLIC
-    "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-    "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd";
-    [<!ENTITY identifiableProperties SYSTEM "classpath://org/hisp/dhis/common/identifiableProperties.hbm">]
-    >
+  "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+  "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd";
+  [<!ENTITY identifiableProperties SYSTEM "classpath://org/hisp/dhis/common/identifiableProperties.hbm">]
+  >
 
 <hibernate-mapping>
   <class name="org.hisp.dhis.user.UserGroup" table="usergroup">
@@ -18,6 +18,17 @@
       <many-to-many column="userid" class="org.hisp.dhis.user.User" foreign-key="fk_usergroup_userid" />
     </set>
 
+    <!-- Access properties -->
+    <many-to-one name="user" class="org.hisp.dhis.user.User" column="userid" foreign-key="fk_usergroup_userid" />
+
+    <property name="publicAccess" length="8" />
+
+    <set name="userGroupAccesses" table="usergroupusergroupaccesses">
+      <cache usage="read-write" />
+      <key column="usergroupid" />
+      <many-to-many class="org.hisp.dhis.user.UserGroupAccess" column="usergroupaccessid" unique="true" />
+    </set>
+
     <!-- Dynamic attribute values -->
 
     <set name="attributeValues" table="usergroupattributevalues">

=== 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-01-30 03:20:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties	2013-01-30 04:56:16 +0000
@@ -104,10 +104,11 @@
 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_USERGROUP_PUBLIC_ADD=Add Public User Group
+F_USERGROUP_PRIVATE_ADD=Add Private User Group
+F_USERGROUP_UPDATE=Update User Group
+F_USERGROUP_DELETE=Delete User Group
+F_USERGROUP_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/org/hisp/dhis/user/i18n_module_es_ES.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_es_ES.properties	2013-01-30 03:20:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_es_ES.properties	2013-01-30 04:56:16 +0000
@@ -177,10 +177,10 @@
 F_INDICATORGROUPSET_UPDATE=Actualizar Grupo de Indicadores
 F_ORGANISATIONUNITLEVEL_UPDATE=Actualizar Grupo de Unidad Organizativa
 F_USERROLE_LIST=Listado de Roles de Usuario
-F_USER_GRUP_ADD=A\u00f1adir Grupo de Usuarios
-F_USER_GRUP_UPDATE=Actualizar rol de usuario
-F_USER_GRUP_DELETE=Eliminar Rol de Usuario
-F_USER_GRUP_LIST=Listado de Grupos de Usuarios
+F_USERGROUP_PUBLIC_ADD=A\u00f1adir Grupo de Usuarios
+F_USERGROUP_UPDATE=Actualizar rol de usuario
+F_USERGROUP_DELETE=Eliminar Rol de Usuario
+F_USERGROUP_LIST=Listado de Grupos de Usuarios
 F_USER_VIEW=Ver usuarios
 F_EXCEL_REPORT_ADMINISTRATION=Administraci\u00f3n de Reporte en Excel
 F_RELATIONSHIPTYPE_DELETE=Eliminar Tipo de Relaci\u00f3n

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_fr_FR.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_fr_FR.properties	2013-01-30 03:20:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_fr_FR.properties	2013-01-30 04:56:16 +0000
@@ -93,10 +93,10 @@
 F_USERROLE_DELETE=Supprimerr\u00f4le d'utilisateur
 F_USERROLE_UPDATE=Modifier r\u00f4le d'utilisateur
 F_USERROLE_LIST=Lister les r\u00f4les d'utilisateur
-F_USER_GRUP_ADD=Ajouter groupe d'utilisateurs
-F_USER_GRUP_UPDATE=Modifier groupe d'utilisateurs
-F_USER_GRUP_DELETE=Supprimer groupe d'utilisateurs
-F_USER_GRUP_LIST=Lister groupe d'utilisateurs
+F_USERGROUP_PUBLIC_ADD=Ajouter groupe d'utilisateurs
+F_USERGROUP_UPDATE=Modifier groupe d'utilisateurs
+F_USERGROUP_DELETE=Supprimer groupe d'utilisateurs
+F_USERGROUP_LIST=Lister groupe d'utilisateurs
 F_USER_ADD=Ajouter utilisateur
 F_USER_DELETE=Supprimer utilisateur
 F_USER_UPDATE=Modifier utilisateur

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_my_MM.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_my_MM.properties	2013-01-30 03:20:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_my_MM.properties	2013-01-30 04:56:16 +0000
@@ -93,10 +93,10 @@
 F_USERROLE_DELETE=Delete User Role
 F_USERROLE_UPDATE=Update User Role
 F_USERROLE_LIST=List User Roles
-F_USER_GRUP_ADD=\u1021\u101e\u102f\u1036\u1038\u1015\u103c\u102f\u101e\u1030\u1021\u102f\u1015\u103a\u1005\u102f \u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u101e\u100a\u103a\u104b
-F_USER_GRUP_UPDATE=\u1021\u101e\u102f\u1036\u1038\u1015\u103c\u102f\u101e\u1030\u1021\u102f\u1015\u103a\u1005\u102f \u1015\u103c\u1004\u103a\u1006\u1004\u103a\u1019\u103d\u1019\u103a\u1038\u1019\u1036\u101e\u100a\u103a\u104b
-F_USER_GRUP_DELETE=\u1021\u101e\u102f\u1036\u1038\u1015\u103c\u102f\u101e\u1030\u1021\u102f\u1015\u103a\u1005\u102f \u1016\u103b\u1000\u103a\u101e\u100a\u103a\u104b
-F_USER_GRUP_LIST=\u1021\u101e\u102f\u1036\u1038\u1015\u103c\u102f\u101e\u1030\u1021\u102f\u1015\u103a\u1005\u102f \u1005\u102c\u101b\u1004\u103a\u1038
+F_USERGROUP_PUBLIC_ADD=\u1021\u101e\u102f\u1036\u1038\u1015\u103c\u102f\u101e\u1030\u1021\u102f\u1015\u103a\u1005\u102f \u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u101e\u100a\u103a\u104b
+F_USERGROUP_UPDATE=\u1021\u101e\u102f\u1036\u1038\u1015\u103c\u102f\u101e\u1030\u1021\u102f\u1015\u103a\u1005\u102f \u1015\u103c\u1004\u103a\u1006\u1004\u103a\u1019\u103d\u1019\u103a\u1038\u1019\u1036\u101e\u100a\u103a\u104b
+F_USERGROUP_DELETE=\u1021\u101e\u102f\u1036\u1038\u1015\u103c\u102f\u101e\u1030\u1021\u102f\u1015\u103a\u1005\u102f \u1016\u103b\u1000\u103a\u101e\u100a\u103a\u104b
+F_USERGROUP_LIST=\u1021\u101e\u102f\u1036\u1038\u1015\u103c\u102f\u101e\u1030\u1021\u102f\u1015\u103a\u1005\u102f \u1005\u102c\u101b\u1004\u103a\u1038
 F_USER_ADD=\u1021\u101e\u102f\u1036\u1038\u1015\u103c\u102f\u101e\u1030 \u1015\u1031\u102b\u1004\u103a\u1038\u101e\u100a\u103a\u104b
 F_USER_DELETE=\u1021\u101e\u102f\u1036\u1038\u1015\u103c\u102f\u101e\u1030 \u1016\u103b\u1000\u103a\u101e\u100a\u103a\u104b
 F_USER_UPDATE=\u1021\u101e\u102f\u1036\u1038\u1015\u103c\u102f\u101e\u1030 \u1015\u103c\u1004\u103a\u1006\u1004\u103a\u1019\u103d\u1019\u103a\u1038\u1019\u1036\u101e\u100a\u103a\u104b

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_pt_PT.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_pt_PT.properties	2013-01-30 03:20:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_pt_PT.properties	2013-01-30 04:56:16 +0000
@@ -93,10 +93,10 @@
 F_USERROLE_DELETE=Apagar Papel do Usu\u00e1rio
 F_USERROLE_UPDATE=Actualizar Papel do Usu\u00e1rio
 F_USERROLE_LIST=Lista de fun\u00e7\u00f5es de usu\u00e1rio
-F_USER_GRUP_ADD=Adiccionar Grupo de Usu\u00e1rios
-F_USER_GRUP_UPDATE=Actualizar Papel do Usu\u00e1rio
-F_USER_GRUP_DELETE=Apagar Papel do Usu\u00e1rio
-F_USER_GRUP_LIST=Listar grupos de usu\u00e1rios
+F_USERGROUP_PUBLIC_ADD=Adiccionar Grupo de Usu\u00e1rios
+F_USERGROUP_UPDATE=Actualizar Papel do Usu\u00e1rio
+F_USERGROUP_DELETE=Apagar Papel do Usu\u00e1rio
+F_USERGROUP_LIST=Listar grupos de usu\u00e1rios
 F_USER_ADD=Adiccionar usu\u00e1rio
 F_USER_DELETE=Eliminar usu\u00e1rio
 F_USER_UPDATE=Actualizar usu\u00e1rio

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_vi_VN.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_vi_VN.properties	2013-01-30 03:20:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_vi_VN.properties	2013-01-30 04:56:16 +0000
@@ -73,7 +73,7 @@
 M_dhis-web-light=Xem ch\u1ee9c n\u0103ng Thu G\u1ecdn
 F_PROGRAM_ATTRIBUTE_DELETE=X\u00f3a Thu\u1ed9c t\u00ednh ch\u01b0\u01a1ng tr\u00ecnh
 M_dhis-web-caseentry=Xem ch\u1ee9c n\u0103ng Nh\u1eadp D\u1eef Lli\u1ec7u
-F_USER_GRUP_ADD=Th\u00eam nh\u00f3m ng\u01b0\u1eddi d\u00f9ng
+F_USERGROUP_PUBLIC_ADD=Th\u00eam nh\u00f3m ng\u01b0\u1eddi d\u00f9ng
 F_REPORT_PUBLIC_ADD=Th\u00eam b\u00e1o c\u00e1o
 user=T\u00ean ng\u01b0\u1eddi d\u00f9ng
 name_in_use=T\u00ean n\u00e0y \u0111\u00e3 \u0111\u01b0\u1ee3c d\u00f9ng, h\u00e3y x\u00e1c \u0111\u1ecbnh m\u1ed9t t\u00ean kh\u00e1c
@@ -116,7 +116,7 @@
 F_ORGANISATIONUNIT_UPDATE=C\u1eadp nh\u1eadt \u0111\u01a1n v\u1ecb
 _dhis-web-dashboard=Xem ch\u1ee9c n\u0103ng b\u1ea3ng \u0111i\u1ec1u khi\u1ec3n
 F_DATAMART_ADMIN=Qu\u1ea3n tr\u1ecb d\u1eef li\u1ec7u t\u1ed5ng h\u1ee3p
-F_USER_GRUP_UPDATE=C\u1eadp nh\u1eadt nh\u00f3m ng\u01b0\u1eddi d\u00f9ng
+F_USERGROUP_UPDATE=C\u1eadp nh\u1eadt nh\u00f3m ng\u01b0\u1eddi d\u00f9ng
 add_new=Th\u00eam m\u1edbi
 F_ORGUNITGROUP_ADD=Th\u00eam nh\u00f3m \u0111\u01a1n v\u1ecb
 password_is_not_valid=M\u1eadt kh\u1ea9u kh\u00f4ng h\u1ee3p l\u1ec7
@@ -232,7 +232,7 @@
 edit_role=C\u1eadp nh\u1eadt quy\u1ec1n ng\u01b0\u1eddi d\u00f9ng
 show_all_users=Hi\u1ec3n th\u1ecb t\u1ea5t c\u1ea3 ng\u01b0\u1eddi d\u00f9ng
 specify_raw_password=Vui l\u00f2ng nh\u1eadp m\u1eadt kh\u1ea9u
-F_USER_GRUP_DELETE=X\u00f3a nh\u00f3m ng\u01b0\u1eddi d\u00f9ng
+F_USERGROUP_DELETE=X\u00f3a nh\u00f3m ng\u01b0\u1eddi d\u00f9ng
 username=T\u00ean t\u00e0i kho\u1ea3n
 F_PROGRAM_ATTRIBUTE_UPDATE=C\u1eadp nh\u1eadt Thu\u1ed9c t\u00ednh ch\u01b0\u01a1ng tr\u00ecnh
 adding_role_failed=L\u1ed7i do th\u00eam ph\u00e2n quy\u1ec1n
@@ -257,7 +257,7 @@
 can_not_remove_last_super_user_role=Kh\u00f4ng th\u1ec3 x\u00f3a ng\u01b0\u1eddi d\u00f9ng cao c\u1ea5p l\u1ea7n tr\u01b0\u1edbc.
 group_members=Th\u00e0nh vi\u00ean nh\u00f3m
 user_use_group=C\u00f3 c\u00e1c ng\u01b0\u1eddi d\u00f9ng s\u1eed d\u1ee5ng ph\u00e2n quy\u1ec1n n\u00e0y
-F_USER_GRUP_LIST=Li\u1ec7t k\u00ea nh\u00f3m ng\u01b0\u1eddi d\u00f9ng
+F_USERGROUP_LIST=Li\u1ec7t k\u00ea nh\u00f3m ng\u01b0\u1eddi d\u00f9ng
 excel_importing=\u0110\u01b0a v\u00e0o d\u1eef li\u1ec7u (t\u1eeb file Excel)
 add_user_group=Th\u00eam nh\u00f3m ng\u01b0\u1eddi d\u00f9ng
 organisation_units=C\u00e1c \u0111\u01a1n v\u1ecb

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_zh_CN.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_zh_CN.properties	2013-01-30 03:20:49 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_zh_CN.properties	2013-01-30 04:56:16 +0000
@@ -80,7 +80,7 @@
 F_EXCEL_TEMPLATE_MANAGEMENT_RENAME=\u91CD\u547D\u540DExcel\u6A21\u677F
 F_PROGRAM_UNENROLLMENT=\u9879\u76EE\u53D6\u6D88
 F_INDICATORTYPE_DELETE=\u5220\u9664\u6307\u6807\u7C7B\u578B
-F_USER_GRUP_UPDATE=\u66F4\u65B0\u7528\u6237\u7EC4
+F_USERGROUP_UPDATE=\u66F4\u65B0\u7528\u6237\u7EC4
 user_role_management=\u7528\u6237\u89D2\u8272\u7BA1\u7406
 user=\u7528\u6237
 F_DATADICTIONARY_PUBLIC_ADD=\u6DFB\u52A0\u6570\u636E\u8BCD\u5178
@@ -136,7 +136,7 @@
 M_dhis-web-maintenance-dataset=\u6570\u636E\u96C6\u7EF4\u62A4
 F_INDICATORGROUP_PUBLIC_ADD=\u6DFB\u52A0\u6307\u6807\u7EC4
 F_DV_ADMIN=\u7BA1\u7406\u6570\u636E\u53EF\u89C6\u5316\u5DE5\u5177
-F_USER_GRUP_ADD=\u6DFB\u52A0\u7528\u6237\u7EC4
+F_USERGROUP_PUBLIC_ADD=\u6DFB\u52A0\u7528\u6237\u7EC4
 F_GENERATE_BENEFICIARY_TABULAR_REPORT=\u751F\u6210\u53D7\u76CA\u4EBA\u8868\u683C\u62A5\u544A
 select=\u9009\u62E9
 F_ATTRIBUTE_DELETE=\u5220\u9664\u5C5E\u6027
@@ -217,12 +217,12 @@
 M_dhis-web-exportdatamart=\u5BFC\u51FA\u6570\u636E\u96C6\u5408
 clear=\u6E05\u9664
 F_OPTIONSET_MANAGEMENT=\u9009\u9879\u96C6\u7BA1\u7406
-F_USER_GRUP_DELETE=\u5220\u9664\u7528\u6237\u7EC4
+F_USERGROUP_DELETE=\u5220\u9664\u7528\u6237\u7EC4
 F_PATIENT_DATAVALUE_UPDATE=\u66F4\u65B0\u53D7\u76CA\u4EBA\u6570\u636E\u503C
 deselect_role=\u53D6\u6D88\u89D2\u8272\u9009\u62E9
 group_members=\u56E2\u961F\u6210\u5458
 F_PATIENTATTRIBUTEVALUE_DELETE=\u5220\u9664\u53D7\u76CA\u4EBA\u5C5E\u6027\u503C
-F_USER_GRUP_LIST=\u7528\u6237\u7EC4\u5217\u8868
+F_USERGROUP_LIST=\u7528\u6237\u7EC4\u5217\u8868
 M_dhis-web-datamart=\u6570\u636E\u96C6\u5408
 user_management=\u7528\u6237\u7BA1\u7406
 F_EXCEL_TEMPLATE_MAMAGEMENT_UPLOAD=\u4E0A\u4F20Excel\u6A21\u677F

=== 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	2012-11-08 13:26:59 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/struts.xml	2013-01-30 04:56:16 +0000
@@ -169,7 +169,7 @@
       <param name="page">/dhis-web-maintenance-user/userGroupList.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_LIST</param>
+      <param name="requiredAuthorities">F_USERGROUP_LIST</param>
     </action>
 
     <action name="getUserGroup" class="org.hisp.dhis.user.action.GetUserGroupAction">
@@ -182,31 +182,31 @@
       <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>
+      <param name="anyAuthorities">F_USERGROUP_PUBLIC_ADD, F_USERGROUP_PRIVATE_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>
+      <param name="anyAuthorities">F_USERGROUP_PUBLIC_ADD, F_USERGROUP_PRIVATE_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>
+      <param name="requiredAuthorities">F_USERGROUP_UPDATE</param>
     </action>
 
     <action name="updateUserGroup" class="org.hisp.dhis.user.action.UpdateUserGroupAction">
       <result name="success" type="redirect">getAllUserGroups.action?currentPage=${keyCurrentPage}</result>
-      <param name="requiredAuthorities">F_USER_GRUP_UPDATE</param>
+      <param name="requiredAuthorities">F_USERGROUP_UPDATE</param>
     </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="error" type="velocity">/dhis-web-commons/ajax/jsonResponseError.vm</result>
-      <param name="requiredAuthorities">F_USER_GRUP_DELETE</param>
+      <param name="requiredAuthorities">F_USERGROUP_DELETE</param>
     </action>
 
     <action name="validateUserGroup" class="org.hisp.dhis.user.action.ValidateUserGroupAction">