← Back to team overview

dhis2-devs team mailing list archive

  1. dhis2-devs team
  2. Mailing list archive
  3. Message #21028

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 9852: Set anyAuthorities for public and private authorities of program; update authority keys in langua...

  Thread Previous • Date Previous • • Thread Next 
------------------------------------------------------------
revno: 9852
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-02-20 16:08:47 +0700
message:
  Set anyAuthorities for public and private authorities of program; update authority keys in language files.
modified:
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml
  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


--
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-patient/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml	2013-02-20 08:51:02 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml	2013-02-20 09:08:47 +0000
@@ -232,7 +232,7 @@
 			class="org.hisp.dhis.patient.action.program.AddProgramAction">
 			<result name="success" type="redirect">program.action
 			</result>
-			<param name="requiredAuthorities">F_PROGRAM_PUBLIC_ADD,F_PROGRAM_PRIVATE_ADD</param>
+			<param name="anyAuthorities">F_PROGRAM_PUBLIC_ADD,F_PROGRAM_PRIVATE_ADD</param>
 		</action>
 
 
@@ -242,7 +242,7 @@
 			<param name="page">/dhis-web-maintenance-patient/addProgramForm.vm</param>
 			<param name="javascripts">javascript/program.js</param>
 			<param name="stylesheets">style/basic.css</param>
-			<param name="requiredAuthorities">F_PROGRAM_PUBLIC_ADD,F_PROGRAM_PRIVATE_ADD</param>
+			<param name="anyAuthorities">F_PROGRAM_PUBLIC_ADD,F_PROGRAM_PRIVATE_ADD</param>
 		</action>
 
 		<action name="showUpdateProgramForm"
@@ -281,7 +281,7 @@
 			<param name="page">/dhis-web-maintenance-patient/programUserrole.vm</param>
 			<param name="javascripts">javascript/program.js</param>
 			<param name="stylesheets">style/basic.css</param>
-			<param name="requiredAuthorities">F_PROGRAM_PUBLIC_ADD,F_PROGRAM_PRIVATE_ADD</param>
+			<param name="anyAuthorities">F_PROGRAM_PUBLIC_ADD,F_PROGRAM_PRIVATE_ADD</param>
 		</action>
 
 		<action name="defineProgramUserrole"

=== 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 04:56:16 +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-02-20 09:08:47 +0000
@@ -193,7 +193,7 @@
 F_PATIENT_ADD=Add Person
 F_PATIENT_UPDATE=Update Person
 F_PATIENT_DELETE=Delete Person
-F_PROGRAM_ADD=A\u00f1adir Programa
+F_F_PROGRAM_PUBLIC_ADD=A\u00f1adir Programa
 F_PROGRAM_UPDATE=Actualizar Programa
 F_PROGRAM_DELETE=Eliminar Programa
 F_PROGRAM_VALIDATION=Administrar Validaci\u00f3n de Programa

=== 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 04:56:16 +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-02-20 09:08:47 +0000
@@ -130,7 +130,7 @@
 F_PATIENT_ADD=Ajouter patient
 F_PATIENT_UPDATE=Modifier Patient
 F_PATIENT_DELETE=Supprimer Patient
-F_PROGRAM_ADD=Ajouter programme
+F_F_PROGRAM_PUBLIC_ADD=Ajouter programme
 F_PROGRAM_UPDATE=Modifier Programme
 F_PROGRAM_DELETE=Supprimer programme
 F_PROGRAM_VALIDATION=G\u00e9rer validation de programme

=== 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 04:56:16 +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-02-20 09:08:47 +0000
@@ -129,7 +129,7 @@
 F_PATIENT_ADD=Beneficiary \u1000\u102d\u102f \u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u101e\u100a\u103a\u104b
 F_PATIENT_UPDATE=Beneficiary \u1000\u102d\u102f \u1015\u103c\u1004\u103a\u1006\u1004\u103a\u1019\u103d\u1019\u103a\u1038\u1019\u1036\u101e\u100a\u103a\u104b 
 F_PATIENT_DELETE=Beneficiary \u1000\u102d\u102f \u1016\u103b\u1000\u103a\u101e\u100a\u103a\u104b
-F_PROGRAM_ADD=Program \u1000\u102d\u102f \u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u101e\u100a\u103a\u104b
+F_F_PROGRAM_PUBLIC_ADD=Program \u1000\u102d\u102f \u1015\u1031\u102b\u1004\u103a\u1038\u1011\u100a\u1037\u103a\u101e\u100a\u103a\u104b
 F_PROGRAM_UPDATE=Program \u1000\u102d\u102f \u1015\u103c\u1004\u103a\u1006\u1004\u103a\u1019\u103d\u1019\u103a\u1038\u1019\u1036\u101e\u100a\u103a\u104b
 F_PROGRAM_DELETE=Program \u1000\u102d\u102f\u1016\u103b\u1000\u103a\u101e\u100a\u103a\u104b
 F_PROGRAM_VALIDATION=Program \u1006\u1014\u103a\u1038\u1005\u1005\u103a\u1019\u103e\u102f\u1000\u102d\u102f \u1005\u102e\u1019\u1036\u1001\u1014\u1037\u103a\u1001\u103d\u1032\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-02-08 21:57:30 +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-02-20 09:08:47 +0000
@@ -130,7 +130,7 @@
 F_PATIENT_ADD=Adiccionar Paciente
 F_PATIENT_UPDATE=Actualizar Paciente
 F_PATIENT_DELETE=Eliminar Paciente
-F_PROGRAM_ADD=Adiccionar Programa
+F_PROGRAM_PUBLIC_ADD=Adiccionar Programa
 F_PROGRAM_UPDATE=Actualizar Programa
 F_PROGRAM_DELETE=Eliminar Programa
 F_PROGRAM_VALIDATION=Gerir Valida\u00e7\u00e3o do Programa

=== 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 04:56:16 +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-02-20 09:08:47 +0000
@@ -108,7 +108,7 @@
 F_INDICATORGROUP_UPDATE=C\u1eadp nh\u1eadt nh\u00f3m ch\u1ec9 s\u1ed1
 M_dhis-web-maintenance-settings=Xem ch\u1ee9c n\u0103ng Qu\u1ea3n L\u00fd C\u00e0i \u0110\u1eb7t
 roles=C\u00e1c ph\u00e2n quy\u1ec1n
-F_PROGRAM_ADD=Th\u00eam ch\u01b0\u01a1ng tr\u00ecnh
+F_PROGRAM_PUBLIC_ADD=Th\u00eam ch\u01b0\u01a1ng tr\u00ecnh
 F_GIS_CONFIGURATION_UPDATE=Thay \u0111\u1ed5i c\u1ea5u h\u00ecnh GIS
 members_of_the_group=Nh\u00f3m \u0111\u01a1n v\u1ecb
 M_dhis-web-exportdatamart=Xem ch\u1ee9c n\u0103ng Xu\u1ea5t Tr\u00edch D\u1eef Li\u1ec7u

=== 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 04:56:16 +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-02-20 09:08:47 +0000
@@ -207,7 +207,7 @@
 F_PROGRAM_UPDATE=\u66F4\u65B0\u9879\u76EE
 confirm_delete_user=\u60A8\u786E\u8BA4\u8981\u5220\u9664\u6B64\u7528\u6237?
 remove_all_in_group=\u5168\u90E8\u79FB\u9664
-F_PROGRAM_ADD=\u6DFB\u52A0\u9879\u76EE
+F_PROGRAM_PUBLIC_ADD=\u6DFB\u52A0\u9879\u76EE
 F_CONCEPT_DELETE=\u5220\u9664\u6982\u5FF5
 data_sets=\u6570\u636E\u96C6
 F_SQLVIEW_EXECUTE=\u6267\u884CSQL\u89C6\u56FE
  Thread Previous • Date Previous • • Thread Next