dhis2-devs team mailing list archive

Thread
Date

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

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

------------------------------------------------------------
revno: 14375
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2014-03-24 20:15:32 +0100
message:
  added public/private authorities for validationRuleGroup
modified:
  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-validationrule/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-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:11:38 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/TableAlteror.java	2014-03-24 19:15:32 +0000
@@ -567,6 +567,7 @@
 
         executeSql( "UPDATE userroleauthorities SET authority='F_SQLVIEW_PUBLIC_ADD' WHERE authority='F_SQLVIEW_ADD'" );
         executeSql( "UPDATE userroleauthorities SET authority='F_OPTIONSET_PUBLIC_ADD' WHERE authority='F_OPTIONSET_ADD'" );
+        executeSql( "UPDATE userroleauthorities SET authority='F_VALIDATIONRULEGROUP_PUBLIC_ADD' WHERE authority='F_VALIDATIONRULEGROUP_ADD'" );
 
         // remove unused authorities
         executeSql( "DELETE FROM userroleauthorities WHERE authority='F_CONCEPT_UPDATE'" );

=== 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:11:38 +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:15:32 +0000
@@ -116,7 +116,8 @@
 F_USER_VIEW=View User
 F_VALIDATIONRULE_ADD=Add/Update Validation Rule
 F_VALIDATIONRULE_DELETE=Delete Validation Rule
-F_VALIDATIONRULEGROUP_ADD=Add/Update Validation Rule Group
+F_VALIDATIONRULEGROUP_PUBLIC_ADD=Add/Update Public Validation Rule Group
+F_VALIDATIONRULEGROUP_PRIVATE_ADD=Add/Update Private Validation Rule Group
 F_VALIDATIONRULEGROUP_DELETE=Delete Validation Rule Group
 F_GIS_CONFIGURATION_UPDATE=Change GIS Configuration
 F_REPORT_PUBLIC_ADD=Add/Update Public Report

=== 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:11:38 +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:15:32 +0000
@@ -6,7 +6,7 @@
 saving_user_failed=Fallo al guardar usuario
 M_dhis-web-maintenance-user=Ver m\u00f3dulo de mantenimiento de Usuarios
 F_DASHBOARD_DOWNLOAD_BACKUP=Crear y bajar respaldo
-F_VALIDATIONRULEGROUP_ADD=A\u00f1adir Grupo de Reglas de Validaci\u00f3n
+F_VALIDATIONRULEGROUP_PUBLIC_ADD=A\u00f1adir Grupo de Reglas de Validaci\u00f3n
 F_REPORT_DELETE=Eliminar Informe
 password_un_matched=Las contrase\u00f1as no son iguales en ambas ocaciones!
 F_USER_ADD=A\u00f1adir Usuario

=== 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:11:38 +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:15:32 +0000
@@ -208,7 +208,7 @@
 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
-F_VALIDATIONRULEGROUP_ADD=Ajouter Groupe de R\u00E8gles de Validation
+F_VALIDATIONRULEGROUP_PUBLIC_ADD=Ajouter Groupe de R\u00E8gles de Validation
 F_ORGUNITGROUP_PUBLIC_ADD=Ajouter groupe d'unit\u00E9s d'organisation
 intro_user_role=Cr\u00E9er, modifier, afficher et supprimer les r\u00F4les des utilisateurs. Un r\u00F4le d'utilisateur est un ensemble de droits dans le syst\u00E8me.
 user_group=Groupe d'utilisateurs

=== 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:11:38 +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:15:32 +0000
@@ -94,7 +94,7 @@
 F_USER_VIEW=Lihat Pengguna
 F_VALIDATIONRULE_ADD=Tambahkan Aturan Validasi
 F_VALIDATIONRULE_DELETE=Hapus Aturan Validasi
-F_VALIDATIONRULEGROUP_ADD=Tambahkan kelompok Aturan Validasi
+F_VALIDATIONRULEGROUP_PUBLIC_ADD=Tambahkan kelompok Aturan Validasi
 F_VALIDATIONRULEGROUP_DELETE=Hapus kelompok Aturan Validasi
 F_GIS_CONFIGURATION_UPDATE=Ubah konfigurasi SIG
 F_REPORT_PUBLIC_ADD=Tambahkan Laporan 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:11:38 +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:15:32 +0000
@@ -96,7 +96,7 @@
 F_USER_VIEW=View User
 F_VALIDATIONRULE_ADD=Add/Update Validation Rule
 F_VALIDATIONRULE_DELETE=Delete Validation Rule
-F_VALIDATIONRULEGROUP_ADD=Add/Update Validation Rule Group
+F_VALIDATIONRULEGROUP_PUBLIC_ADD=Add/Update Validation Rule Group
 F_VALIDATIONRULEGROUP_DELETE=Delete Validation Rule Group
 F_GIS_CONFIGURATION_UPDATE=Change GIS Configuration
 F_REPORT_PUBLIC_ADD=Add/Update Public Report

=== 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:11:38 +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:15:32 +0000
@@ -81,7 +81,7 @@
 F_USER_DELETE=\u1021\u101e\u102f\u1036\u1038\u1015\u103c\u102f\u101e\u1030 \u1016\u103b\u1000\u103a\u101e\u100a\u103a\u104b
 F_VALIDATIONRULE_ADD=\u1006\u1014\u103a\u1038\u1005\u1005\u103a\u1019\u103e\u102f\u1005\u100a\u103a\u1038\u1019\u103b\u1009\u103a\u1038\u1025\u1015\u1012\u1031 \u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u101e\u100a\u103a\u104b
 F_VALIDATIONRULE_DELETE=\u1006\u1014\u103a\u1038\u1005\u1005\u103a\u1019\u103e\u102f\u1005\u100a\u103a\u1038\u1019\u103b\u1009\u103a\u1038\u1025\u1015\u1012\u1031 \u1016\u103b\u1000\u103a\u101e\u100a\u103a\u104b
-F_VALIDATIONRULEGROUP_ADD=\u1006\u1014\u103a\u1038\u1005\u1005\u103a\u1019\u103e\u102f\u1005\u100a\u103a\u1038\u1019\u103b\u1009\u103a\u1038\u1025\u1015\u1012\u1031 \u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u101e\u100a\u103a\u104b
+F_VALIDATIONRULEGROUP_PUBLIC_ADD=\u1006\u1014\u103a\u1038\u1005\u1005\u103a\u1019\u103e\u102f\u1005\u100a\u103a\u1038\u1019\u103b\u1009\u103a\u1038\u1025\u1015\u1012\u1031 \u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u101e\u100a\u103a\u104b
 F_VALIDATIONRULEGROUP_DELETE=\u1006\u1014\u103a\u1038\u1005\u1005\u103a\u1019\u103e\u102f\u1005\u100a\u103a\u1038\u1019\u103b\u1009\u103a\u1038\u1025\u1015\u1012\u1031 \u1016\u103b\u1000\u103a\u101e\u100a\u103a\u104b
 F_GIS_CONFIGURATION_UPDATE=GIS \u1015\u102f\u1036\u1005\u1036 \u1015\u103c\u1031\u102c\u1004\u103a\u1038\u101e\u100a\u103a\u104b
 F_REPORT_PUBLIC_ADD=\u1021\u1005\u102e\u101b\u1004\u103a\u1001\u1036\u1005\u102c\u1000\u102d\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:11:38 +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:15:32 +0000
@@ -217,7 +217,7 @@
 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
-F_VALIDATIONRULEGROUP_ADD=Adicionar grupo de regra de valida\u00E7\u00E3o
+F_VALIDATIONRULEGROUP_PUBLIC_ADD=Adicionar grupo de regra de valida\u00E7\u00E3o
 F_ORGUNITGROUP_PUBLIC_ADD=Adicionar Grupo de Unidade Organizacional
 intro_user_role=Criar, modificar, visualizar e excluir fun\u00E7\u00F5es de utilizador. Uma fun\u00E7\u00E3o de utilizador tem um conjunto de autoridades no sistema.
 user_group=Grupo de utilizadors

=== 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:11:38 +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:15:32 +0000
@@ -206,7 +206,7 @@
 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
-F_VALIDATIONRULEGROUP_ADD=Adiccionar grupo de regra de valida\u00E7\u00E3o
+F_VALIDATIONRULEGROUP_PUBLIC_ADD=Adiccionar grupo de regra de valida\u00E7\u00E3o
 intro_user_role=Criar, modificar, visualizar e excluir fun\u00E7\u00F5es de utilizador. Uma fun\u00E7\u00E3o de utilizador tem um conjunto de autoridades no sistema.
 user_group=Grupo de Usu\u00E1rios
 adding_user_failed=Falha na adic\u00E7\u00E3o de utilizador

=== 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:11:38 +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:15:32 +0000
@@ -97,7 +97,7 @@
 F_USER_VIEW = \u041F\u0440\u043E\u0441\u043C\u043E\u0442\u0440 \u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044F
 F_VALIDATIONRULE_ADD = \u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u043F\u0440\u0430\u0432\u0438\u043B\u043E \u043F\u0440\u043E\u0432\u0435\u0440\u043A\u0438
 F_VALIDATIONRULE_DELETE = \u0423\u0434\u0430\u043B\u0438\u0442\u044C \u043F\u0440\u0430\u0432\u0438\u043B\u043E \u043F\u0440\u043E\u0432\u0435\u0440\u043A\u0438
-F_VALIDATIONRULEGROUP_ADD = \u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u0433\u0440\u0443\u043F\u043F\u0443 \u043F\u0440\u0430\u0432\u0438\u043B\u0430 \u043F\u0440\u043E\u0432\u0435\u0440\u043A\u0438
+F_VALIDATIONRULEGROUP_PUBLIC_ADD = \u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u0433\u0440\u0443\u043F\u043F\u0443 \u043F\u0440\u0430\u0432\u0438\u043B\u0430 \u043F\u0440\u043E\u0432\u0435\u0440\u043A\u0438
 F_VALIDATIONRULEGROUP_DELETE = \u0423\u0434\u0430\u043B\u0438\u0442\u044C \u0433\u0440\u0443\u043F\u043F\u0443 \u043F\u0440\u0430\u0432\u0438\u043B\u0430 \u043F\u0440\u043E\u0432\u0435\u0440\u043A\u0438
 F_GIS_CONFIGURATION_UPDATE = \u0418\u0437\u043C\u0435\u043D\u0438\u0442\u044C \u043A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044E \u0413\u0418\u0421
 F_REPORT_PUBLIC_ADD = \u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u043F\u0443\u0431\u043B\u0438\u0447\u043D\u044B\u0439 \u043E\u0442\u0447\u0435\u0442

=== 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:11:38 +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:15:32 +0000
@@ -97,7 +97,7 @@
 F_USER_VIEW = \u041D\u0430\u043C\u043E\u0438\u0448\u0438 \u041A\u043E\u0440\u0431\u0430\u0440
 F_VALIDATIONRULE_ADD = \u0418\u043B\u043E\u0432\u0430\u0438 \u049A\u043E\u0438\u0434\u0430\u0438 \u0441\u0430\u043D\u04B7\u0438\u0448\u0438 \u044D\u044A\u0442\u0438\u0431\u043E\u0440
 F_VALIDATIONRULE_DELETE = \u041D\u0435\u0441\u0442 \u043A\u0430\u0440\u0434\u0430\u043D\u0438 \u049A\u043E\u0438\u0434\u0430\u0438 \u0441\u0430\u043D\u04B7\u0438\u0448\u0438 \u044D\u044A\u0442\u0438\u0431\u043E\u0440
-F_VALIDATIONRULEGROUP_ADD = \u0418\u043B\u043E\u0432\u0430\u0438 \u0413\u0443\u0440\u04EF\u04B3\u0438 \u049B\u043E\u0438\u0434\u0430\u0438 \u0441\u0430\u043D\u04B7\u0438\u0448\u0438 \u044D\u044A\u0442\u0438\u0431\u043E\u0440
+F_VALIDATIONRULEGROUP_PUBLIC_ADD = \u0418\u043B\u043E\u0432\u0430\u0438 \u0413\u0443\u0440\u04EF\u04B3\u0438 \u049B\u043E\u0438\u0434\u0430\u0438 \u0441\u0430\u043D\u04B7\u0438\u0448\u0438 \u044D\u044A\u0442\u0438\u0431\u043E\u0440
 F_VALIDATIONRULEGROUP_DELETE = \u041D\u0435\u0441\u0442 \u043A\u0430\u0440\u0434\u0430\u043D\u0438 \u0413\u0443\u0440\u04EF\u04B3\u0438 \u049B\u043E\u0438\u0434\u0430\u0438 \u0441\u0430\u043D\u04B7\u0438\u0448\u0438 \u044D\u044A\u0442\u0438\u0431\u043E\u0440
 F_GIS_CONFIGURATION_UPDATE = \u0442\u0430\u0493\u0439\u0438\u0440 \u0434\u043E\u0434\u0430\u043D\u0438 \u043A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0442\u0441\u0438\u044F\u0438 \u0413\u0418\u0421
 F_REPORT_PUBLIC_ADD = \u0418\u043B\u043E\u0432\u0430\u0438 \u04B2\u0438\u0441\u043E\u0431\u043E\u0442\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:11:38 +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:15:32 +0000
@@ -15,7 +15,7 @@
 edit_user_group=S\u1eeda nh\u00f3m ng\u01b0\u1eddi d\u00f9ng
 F_PATIENTIDENTIFIERTYPE_ADD=Th\u00eam Lo\u1ea1i \u0111\u1ecbnh danh c\u00e1 th\u1ec3
 F_DASHBOARD_DOWNLOAD_BACKUP=T\u1ea1o v\u00e0 t\u1ea3i xu\u1ed1ng d\u1eef li\u1ec7u sao l\u01b0u
-F_VALIDATIONRULEGROUP_ADD=Th\u00eam nh\u00f3m quy t\u1eafc
+F_VALIDATIONRULEGROUP_PUBLIC_ADD=Th\u00eam nh\u00f3m quy t\u1eafc
 F_REPORT_DELETE=X\u00f3a b\u00e1o c\u00e1o
 password_un_matched=M\u1eadt kh\u1ea9u v\u00e0 Nh\u1eadp l\u1ea1i m\u1eadt kh\u1ea9u kh\u00f4ng tr\u00f9ng nhau
 F_CONSTANT_DELETE=X\u00f3a H\u1eb1ng 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:11:38 +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:15:32 +0000
@@ -165,7 +165,7 @@
 F_VALIDATIONRULEGROUP_DELETE=\u5220\u9664\u9A8C\u8BC1\u89C4\u5219\u7EC4
 specify_description=\u6307\u5B9A\u63CF\u8FF0
 F_DATAELEMENT_DELETE=\u5220\u9664\u6570\u636E\u5143
-F_VALIDATIONRULEGROUP_ADD=\u6DFB\u52A0\u9A8C\u8BC1\u89C4\u5219\u7EC4
+F_VALIDATIONRULEGROUP_PUBLIC_ADD=\u6DFB\u52A0\u9A8C\u8BC1\u89C4\u5219\u7EC4
 intro_user_role=\u521B\u5EFA\u3001\u4FEE\u6539\u3001\u67E5\u770B\u548C\u5220\u9664\u7528\u6237\u89D2\u8272\uFF0C\u5728\u8FD9\u4E2A\u7CFB\u7EDF\u4E2D\u4E00\u4E2A\u7528\u6237\u89D2\u8272\u6709\u4E00\u7CFB\u5217\u7684\u6743\u9650\u3002
 user_group=\u7528\u6237\u7EC4
 adding_user_failed=\u6DFB\u52A0\u7528\u6237\u5931\u8D25

=== modified file 'dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/struts.xml	2013-11-08 23:17:37 +0000
+++ dhis-2/dhis-web/dhis-web-validationrule/src/main/resources/struts.xml	2014-03-24 19:15:32 +0000
@@ -105,12 +105,12 @@
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-validationrule/addValidationRuleGroupForm.vm</param>
       <param name="javascripts">javascript/validationRuleGroup.js, javascript/addValidationRuleGroupForm.js</param>
-      <param name="requiredAuthorities">F_VALIDATIONRULEGROUP_ADD</param>
+      <param name="anyAuthorities">F_VALIDATIONRULEGROUP_PUBLIC_ADD, F_VALIDATIONRULEGROUP_PRIVATE_ADD</param>
     </action>
 
     <action name="addValidationRuleGroup" class="org.hisp.dhis.validationrule.action.validationrulegroup.AddValidationRuleGroupAction">
       <result name="success" type="redirect">showValidationRuleGroupForm.action</result>
-      <param name="requiredAuthorities">F_VALIDATIONRULEGROUP_ADD</param>
+      <param name="anyAuthorities">F_VALIDATIONRULEGROUP_PUBLIC_ADD, F_VALIDATIONRULEGROUP_PRIVATE_ADD</param>
     </action>
 
     <action name="showUpdateValidationRuleGroupForm"
@@ -118,13 +118,13 @@
       <result name="success" type="velocity">/main.vm</result>
       <param name="page">/dhis-web-validationrule/updateValidationRuleGroupForm.vm</param>
       <param name="javascripts">javascript/validationRuleGroup.js, javascript/updateValidationRuleGroupForm.js</param>
-      <param name="requiredAuthorities">F_VALIDATIONRULEGROUP_ADD</param>
+      <param name="anyAuthorities">F_VALIDATIONRULEGROUP_PUBLIC_ADD, F_VALIDATIONRULEGROUP_PRIVATE_ADD</param>
     </action>
 
     <action name="updateValidationRuleGroup"
       class="org.hisp.dhis.validationrule.action.validationrulegroup.UpdateValidationRuleGroupAction">
       <result name="success" type="redirect">showValidationRuleGroupForm.action?currentPage=${keyCurrentPage}</result>
-      <param name="requiredAuthorities">F_VALIDATIONRULEGROUP_ADD</param>
+      <param name="anyAuthorities">F_VALIDATIONRULEGROUP_PUBLIC_ADD, F_VALIDATIONRULEGROUP_PRIVATE_ADD</param>
     </action>
 
     <action name="validateValidationRuleGroup"