dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 9851
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-02-20 15:51:02 +0700
message:
  Add public and private authorities for program.
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.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-19 06:54:22 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml	2013-02-20 08:51:02 +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_ADD</param>
+			<param name="requiredAuthorities">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_ADD</param>
+			<param name="requiredAuthorities">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_ADD</param>
+			<param name="requiredAuthorities">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.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 04:56:16 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-user/src/main/resources/org/hisp/dhis/user/i18n_module.properties	2013-02-20 08:51:02 +0000
@@ -150,7 +150,8 @@
 F_SEARCH_PATIENT_IN_ALL_FACILITIES = Search Person In All Facilities
 F_PROGRAM_INSTANCE_MANAGEMENT = Program Event Management
 F_PROGRAM_TRACKING_MANAGEMENT = Program Tracking Management
-F_PROGRAM_ADD=Add Program
+F_PROGRAM_PUBLIC_ADD=Add Public Program
+F_PROGRAM_PRIVATE_ADD=Add Private Program
 F_PROGRAM_UPDATE=Update Program
 F_PROGRAM_DELETE=Delete Program
 F_PROGRAM_VALIDATION=Manage Program Validation