dhis2-devs team mailing list archive

Thread
Date

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 14374: added public/private authorities for userRole

To: DHIS 2 developers <dhis2-devs@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Mon, 24 Mar 2014 19:12:26 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 14374
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2014-03-24 20:11:38 +0100
message:
  added public/private authorities for userRole
modified:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserAuthorityGroup.java
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java
  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.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_fr.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_id.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_lo.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_my.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_pt.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_pt_BR.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_ru.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_tg.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_vi.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_zh.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/user/UserAuthorityGroup.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserAuthorityGroup.java	2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/user/UserAuthorityGroup.java	2014-03-24 19:11:38 +0000
@@ -56,7 +56,7 @@
 
     public static final String[] CRITICAL_AUTHS = { "ALL", "F_SCHEDULING_ADMIN",
         "F_PERFORM_MAINTENANCE", "F_MERGE_ORGANISATION_UNITS", "F_ELIMINATE_DUPLICATE_DATA_ELEMENTS",
-        "F_SQLVIEW_MANAGEMENT", "F_SYSTEM_SETTING", "F_USERROLE_LIST", "F_USERROLE_DELETE", "F_USERROLE_ADD" };
+        "F_SQLVIEW_MANAGEMENT", "F_SYSTEM_SETTING", "F_USERROLE_LIST", "F_USERROLE_DELETE", "F_USERROLE_PUBLIC_ADD" };
 
     /**
      * Required and unique.
@@ -97,7 +97,7 @@
     }
 
     @JsonProperty
-    @JsonView( {DetailedView.class, ExportView.class} )
+    @JsonView( { DetailedView.class, ExportView.class } )
     @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
     public String getDescription()
     {
@@ -110,7 +110,7 @@
     }
 
     @JsonProperty
-    @JsonView( {DetailedView.class, ExportView.class} )
+    @JsonView( { DetailedView.class, ExportView.class } )
     @JacksonXmlElementWrapper( localName = "authorities", namespace = DxfNamespaces.DXF_2_0 )
     @JacksonXmlProperty( localName = "authority", namespace = DxfNamespaces.DXF_2_0 )
     public Set<String> getAuthorities()
@@ -135,7 +135,7 @@
 
     @JsonProperty
     @JsonSerialize( contentAs = BaseIdentifiableObject.class )
-    @JsonView( {DetailedView.class, ExportView.class} )
+    @JsonView( { DetailedView.class, ExportView.class } )
     @JacksonXmlElementWrapper( localName = "dataSets", namespace = DxfNamespaces.DXF_2_0 )
     @JacksonXmlProperty( localName = "dataSet", namespace = DxfNamespaces.DXF_2_0 )
     public Set<DataSet> getDataSets()

=== 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	2014-03-24 19:06:54 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java	2014-03-24 19:11:38 +0000
@@ -559,6 +559,7 @@
         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_USERROLE_PUBLIC_ADD' WHERE authority='F_USERROLE_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'" );

=== 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-03-24 19:06:54 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties	2014-03-24 19:11:38 +0000
@@ -103,7 +103,8 @@
 F_ORGUNITGROUPSET_PRIVATE_ADD=Add/Update Private Organisation Unit Group Set
 F_ORGUNITGROUPSET_DELETE=Delete Organisation Unit Group Set
 F_ORGANISATIONUNITLEVEL_UPDATE=Update Organisation Unit Level
-F_USERROLE_ADD=Add/Update User Role
+F_USERROLE_PUBLIC_ADD=Add/Update Public User Role
+F_USERROLE_PRIVATE_ADD=Add/Update Private User Role
 F_USERROLE_DELETE=Delete User Role
 F_USERROLE_LIST=List User Roles
 F_USERGROUP_PUBLIC_ADD=Add/Update Public User Group

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_es.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_es.properties	2014-03-24 19:06:54 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_es.properties	2014-03-24 19:11:38 +0000
@@ -73,7 +73,7 @@
 selected_roles=Roles seleccionados
 F_INDICATORTYPE_ADD=A\u00f1adir Tipo de Indicador
 everything_is_ok=Todo es aceptable
-F_USERROLE_ADD=A\u00f1adir Rol de Usuario
+F_USERROLE_PUBLIC_ADD=A\u00f1adir Rol de Usuario
 unit=Unidad
 user_management=Administraci\u00f3n de usuarios
 firstName=Nombre

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_fr.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_fr.properties	2014-03-24 19:06:54 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_fr.properties	2014-03-24 19:11:38 +0000
@@ -204,7 +204,7 @@
 select_all_in_group=S\u00E9lectionner tout dans le groupe
 confirm_delete=Confirmer la suppression
 F_INDICATORTYPE_ADD=Ajouter type d'indicateur
-F_USERROLE_ADD=Ajouter R\u00F4le d'Utilisateur
+F_USERROLE_PUBLIC_ADD=Ajouter R\u00F4le d'Utilisateur
 F_VALIDATIONRULEGROUP_DELETE=Supprimer Groupe de R\u00E8gles de Validation
 specify_description=Veuillez sp\u00E9cifier une description
 F_DATAELEMENT_DELETE=Supprimer \u00E9l\u00E9ments de donn\u00E9es

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_id.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_id.properties	2014-03-24 19:06:54 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_id.properties	2014-03-24 19:11:38 +0000
@@ -82,7 +82,7 @@
 F_ORGUNITGROUPSET_PUBLIC_ADD=Tambah Set Kelompok Unit Organisasi
 F_ORGUNITGROUPSET_DELETE=Hapus Set Kelompok Unit Organisasi
 F_ORGANISATIONUNITLEVEL_UPDATE=Perbaharui Tingkatan Unit Organisasi
-F_USERROLE_ADD=Tambah Peran Pengguna
+F_USERROLE_PUBLIC_ADD=Tambah Peran Pengguna
 F_USERROLE_DELETE=Hapus Peran Pengguna
 F_USERROLE_LIST=Daftar Peran Pengguna
 F_USERGROUP_PUBLIC_ADD=Tambahkan Kelompok Pengguna Publik

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_lo.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_lo.properties	2014-03-24 19:06:54 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_lo.properties	2014-03-24 19:11:38 +0000
@@ -84,7 +84,7 @@
 F_ORGUNITGROUPSET_PUBLIC_ADD=Add/Update Organisation Unit Group Set
 F_ORGUNITGROUPSET_DELETE=Delete Organisation Unit Group Set
 F_ORGANISATIONUNITLEVEL_UPDATE=Update Organisation Unit Level
-F_USERROLE_ADD=Add/Update User Role
+F_USERROLE_PUBLIC_ADD=Add/Update User Role
 F_USERROLE_DELETE=Delete User Role
 F_USERROLE_LIST=List User Roles
 F_USERGROUP_PUBLIC_ADD=Add/Update Public User Group

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_my.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_my.properties	2014-03-24 19:06:54 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_my.properties	2014-03-24 19:11:38 +0000
@@ -71,7 +71,7 @@
 F_ORGUNITGROUPSET_DELETE=\u1021\u1016\u103d\u1032\u1037\u1021\u1005\u100a\u103a\u1038\u101a\u1030\u1014\u1005\u103a\u1021\u102f\u1015\u103a\u1005\u102f\u104f \u1021\u1005\u102f\u1000\u102d\u102f \u1016\u103b\u1000\u103a\u101e\u100a\u103a\u104b
 F_ORGANISATIONUNITLEVEL_UPDATE=\u1021\u1016\u103d\u1032\u1037\u1021\u1005\u100a\u103a\u1038\u101a\u1030\u1014\u1005\u103a\u1021\u102f\u1015\u103a\u1005\u102f \u1021\u1006\u1004\u1037\u103a \u1015\u103c\u1004\u103a\u1006\u1004\u103a\u1019\u103d\u1019\u103a\u1038\u1019\u1036\u101e\u100a\u103a\u104b
 F_REPORT_DELETE=Delete Report
-F_USERROLE_ADD=Add User Role
+F_USERROLE_PUBLIC_ADD=Add User Role
 F_USERROLE_DELETE=Delete User Role
 F_USERROLE_LIST=List User Roles
 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

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_pt.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_pt.properties	2014-03-24 19:06:54 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_pt.properties	2014-03-24 19:11:38 +0000
@@ -213,7 +213,7 @@
 select_all_in_group=Seleccionar todos no grupo
 confirm_delete=Confirmar elimina\u00E7\u00E3o
 F_INDICATORTYPE_ADD=Adicionar Tipo Indicador
-F_USERROLE_ADD=Adicionar Papel do utilizador
+F_USERROLE_PUBLIC_ADD=Adicionar Papel do utilizador
 F_VALIDATIONRULEGROUP_DELETE=Eliminar grupo de regra de valida\u00E7\u00E3o
 specify_description=Por favor, especifique uma descri\u00E7\u00E3o
 F_DATAELEMENT_DELETE=Apagar Elemento de Dados

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_pt_BR.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_pt_BR.properties	2014-03-24 19:06:54 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_pt_BR.properties	2014-03-24 19:11:38 +0000
@@ -202,7 +202,7 @@
 select_all_in_group=Seleccionar todos no grupo
 confirm_delete=Confirmar elimina\u00E7\u00E3o
 F_INDICATORTYPE_ADD=Adicionar Tipo Indicador
-F_USERROLE_ADD=Adicionar Papel do Usu\u00E1rio
+F_USERROLE_PUBLIC_ADD=Adicionar Papel do Usu\u00E1rio
 F_VALIDATIONRULEGROUP_DELETE=Eliminar grupo de regra de valida\u00E7\u00E3o
 specify_description=Por favor, especifique uma descri\u00E7\u00E3o
 F_DATAELEMENT_DELETE=Apagar Elemento de Dados

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_ru.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_ru.properties	2014-03-24 19:06:54 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_ru.properties	2014-03-24 19:11:38 +0000
@@ -85,7 +85,7 @@
 F_ORGUNITGROUPSET_PUBLIC_ADD = \u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u043D\u0430\u0431\u043E\u0440 \u0433\u0440\u0443\u043F\u043F \u043E\u0440\u0433\u0430\u043D\u0438\u0437\u0430\u0446\u0438\u0439
 F_ORGUNITGROUPSET_DELETE = \u0423\u0434\u0430\u043B\u0438\u0442\u044C \u043D\u0430\u0431\u043E\u0440 \u0433\u0440\u0443\u043F\u043F \u043E\u0440\u0433\u0430\u043D\u0438\u0437\u0430\u0446\u0438\u0439
 F_ORGANISATIONUNITLEVEL_UPDATE = \u041E\u0431\u043D\u043E\u0432\u0438\u0442\u044C \u0443\u0440\u043E\u0432\u0435\u043D\u044C \u043E\u0440\u0433\u0430\u043D\u0438\u0437\u0430\u0446\u0438\u0438
-F_USERROLE_ADD = \u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u0443\u0440\u043E\u0432\u0435\u043D\u044C \u0434\u043E\u0441\u0442\u0443\u043F\u0430
+F_USERROLE_PUBLIC_ADD = \u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u0443\u0440\u043E\u0432\u0435\u043D\u044C \u0434\u043E\u0441\u0442\u0443\u043F\u0430
 F_USERROLE_DELETE = \u0423\u0434\u0430\u043B\u0438\u0442\u044C \u0443\u0440\u043E\u0432\u0435\u043D\u044C \u0434\u043E\u0441\u0442\u0443\u043F\u0430
 F_USERROLE_LIST = \u0421\u043E\u0441\u0442\u0430\u0432\u0438\u0442\u044C \u043F\u0435\u0440\u0435\u0447\u0435\u043D\u044C \u0443\u0440\u043E\u0432\u043D\u0435\u0439 \u0434\u043E\u0441\u0442\u0443\u043F\u0430
 F_USERGROUP_PUBLIC_ADD = \u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u043F\u0443\u0431\u043B\u0438\u0447\u043D\u0443\u044E \u0433\u0440\u0443\u043F\u043F\u0443 \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u0435\u0439

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_tg.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_tg.properties	2014-03-24 19:06:54 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_tg.properties	2014-03-24 19:11:38 +0000
@@ -85,7 +85,7 @@
 F_ORGUNITGROUPSET_PUBLIC_ADD = \u0418\u043B\u043E\u0432\u0430\u0438 \u041C\u0430\u04B7\u043C\u04EF\u0438 \u0433\u0443\u0440\u04EF\u04B3\u0438 \u0432\u043E\u04B3\u0438\u0434\u04B3\u043E\u0438 \u0441\u043E\u0445\u0442\u043E\u0440\u04E3
 F_ORGUNITGROUPSET_DELETE = \u041D\u0435\u0441\u0442 \u043A\u0430\u0440\u0434\u0430\u043D\u0438 \u041C\u0430\u04B7\u043C\u04EF\u0438 \u0433\u0443\u0440\u04EF\u04B3\u0438 \u0432\u043E\u04B3\u0438\u0434\u04B3\u043E\u0438 \u0441\u043E\u0445\u0442\u043E\u0440\u04E3
 F_ORGANISATIONUNITLEVEL_UPDATE = \u041D\u0430\u0432\u0441\u043E\u0437\u0438\u0438 \u0441\u0430\u0442\u04B3\u0438 \u0412\u043E\u04B3\u0438\u0434\u04B3\u043E\u0438 \u0441\u043E\u0445\u0442\u043E\u0440\u04E3
-F_USERROLE_ADD = \u0418\u043B\u043E\u0432\u0430\u0438 \u0412\u0430\u0437\u0438\u0444\u0430\u0438 \u043A\u043E\u0440\u0431\u0430\u0440
+F_USERROLE_PUBLIC_ADD = \u0418\u043B\u043E\u0432\u0430\u0438 \u0412\u0430\u0437\u0438\u0444\u0430\u0438 \u043A\u043E\u0440\u0431\u0430\u0440
 F_USERROLE_DELETE = \u041D\u0435\u0441\u0442 \u043A\u0430\u0440\u0434\u0430\u043D\u0438  \u0412\u0430\u0437\u0438\u0444\u0430\u0438 \u043A\u043E\u0440\u0431\u0430\u0440
 F_USERROLE_LIST = \u041D\u043E\u043C\u0431\u0430\u0440\u043A\u0443\u043D\u0438\u0438 \u0432\u0430\u0437\u0438\u0444\u0430\u04B3\u043E\u0438 \u043A\u043E\u0440\u0431\u0430\u0440
 F_USERGROUP_PUBLIC_ADD = \u0418\u043B\u043E\u0432\u0430\u0438 \u0413\u0443\u0440\u04EF\u04B3\u0438 \u043A\u043E\u0440\u0431\u0430\u0440\u043E\u043D\u0438 \u043E\u043C\u043C\u0430\u0432\u04E3

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_vi.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_vi.properties	2014-03-24 19:06:54 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_vi.properties	2014-03-24 19:11:38 +0000
@@ -122,7 +122,7 @@
 F_RELATIONSHIPTYPE_ADD=Th\u00eam lo\u1ea1i quan h\u1ec7
 F_INDICATORTYPE_ADD=Th\u00eam lo\u1ea1i ch\u1ec9 s\u1ed1
 everything_is_ok=M\u1ecdi th\u1ee9 \u0111\u1ec1u \u1ed5n
-F_USERROLE_ADD=Th\u00eam quy\u1ec1n ng\u01b0\u1eddi d\u00f9ng
+F_USERROLE_PUBLIC_ADD=Th\u00eam quy\u1ec1n ng\u01b0\u1eddi d\u00f9ng
 rolename=T\u00ean quy\u1ec1n
 F_PROGRAMSTAGE_DELETE=X\u00f3a giai \u0111o\u1ea1n ch\u01b0\u01a1ng tr\u00ecnh
 F_INDICATORGROUPSET_DELETE=X\u00f3a T\u1eadp h\u1ee3p nh\u00f3m ch\u1ec9 s\u1ed1

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_zh.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_zh.properties	2014-03-24 19:06:54 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module_zh.properties	2014-03-24 19:11:38 +0000
@@ -161,7 +161,7 @@
 select_all_in_group=\u9009\u62E9\u6240\u6709
 confirm_delete=\u4F60\u786E\u8BA4\u5220\u9664
 F_INDICATORTYPE_ADD=\u6DFB\u52A0\u6307\u6807\u7C7B\u578B
-F_USERROLE_ADD=\u6DFB\u52A0\u7528\u6237\u89D2\u8272
+F_USERROLE_PUBLIC_ADD=\u6DFB\u52A0\u7528\u6237\u89D2\u8272
 F_VALIDATIONRULEGROUP_DELETE=\u5220\u9664\u9A8C\u8BC1\u89C4\u5219\u7EC4
 specify_description=\u6307\u5B9A\u63CF\u8FF0
 F_DATAELEMENT_DELETE=\u5220\u9664\u6570\u636E\u5143

=== 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	2014-02-04 10:12:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/struts.xml	2014-03-24 19:11:38 +0000
@@ -112,26 +112,26 @@
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-maintenance-user/addRoleForm.vm</param>
       <param name="javascripts">../dhis-web-commons/oust/oust.js,javascript/role.js</param>
-      <param name="requiredAuthorities">F_USERROLE_ADD</param>
+      <param name="anyAuthorities">F_USERROLE_PUBLIC_ADD, F_USERROLE_PRIVATE_ADD</param>
     </action>
 
     <action name="addRole" class="org.hisp.dhis.user.action.AddRoleAction">
       <result name="success" type="redirect">allRole.action?currentPage=${keyCurrentPage}&amp;key=${keyCurrentKey}</result>
       <result name="error" type="redirect">showAddRoleForm.action</result>
-      <param name="requiredAuthorities">F_USERROLE_ADD</param>
+      <param name="anyAuthorities">F_USERROLE_PUBLIC_ADD, F_USERROLE_PRIVATE_ADD</param>
     </action>
 
     <action name="showUpdateRoleForm" class="org.hisp.dhis.user.action.GetRoleAction">
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-maintenance-user/updateRoleForm.vm</param>
       <param name="javascripts">../dhis-web-commons/oust/oust.js,javascript/role.js</param>
-      <param name="requiredAuthorities">F_USERROLE_ADD</param>
+      <param name="anyAuthorities">F_USERROLE_PUBLIC_ADD, F_USERROLE_PRIVATE_ADD</param>
     </action>
 
     <action name="updateRole" class="org.hisp.dhis.user.action.UpdateRoleAction">
       <result name="success" type="redirect">allRole.action?currentPage=${keyCurrentPage}&amp;key=${keyCurrentKey}</result>
       <result name="error" type="redirect">showUpdateRoleForm.action</result>
-      <param name="requiredAuthorities">F_USERROLE_ADD</param>
+      <param name="anyAuthorities">F_USERROLE_PUBLIC_ADD, F_USERROLE_PRIVATE_ADD</param>
     </action>
 
     <action name="validateRole" class="org.hisp.dhis.user.action.ValidateRoleAction">