------------------------------------------------------------ revno: 2291 committer: Tran Chau <tran.hispviet...@gmail.com> branch nick: trunk timestamp: Fri 2010-10-01 12:46:30 +0700 message: Minor fix. modified: dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/META-INF/dhis/beans.xml dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/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-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/META-INF/dhis/beans.xml' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/META-INF/dhis/beans.xml 2010-09-27 10:20:04 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/META-INF/dhis/beans.xml 2010-10-01 05:46:30 +0000 @@ -373,8 +373,6 @@ scope="prototype"> <property name="selectionManager" ref="org.hisp.dhis.ouwt.manager.OrganisationUnitSelectionManager" /> - <property name="selectedStateManager" - ref="org.hisp.dhis.patient.state.SelectedStateManager" /> </bean> <bean id="org.hisp.dhis.patient.action.patient.SearchPatientAction" === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties 2010-09-30 06:51:44 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/org/hisp/dhis/patient/i18n_module.properties 2010-10-01 05:46:30 +0000 @@ -415,4 +415,5 @@ number_of_attribute = Number of attributes confirm_delete_patientIdentifierType = Are you sure you want to delete identifier type ? available_program = Available Program -selected_program = Selected Program \ No newline at end of file +selected_program = Selected Program +object_not_deleted_associated_by_objects = Object not deleted because it is associated by objects of type \ No newline at end of file === 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 2010-09-27 10:20:04 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/resources/struts.xml 2010-10-01 05:46:30 +0000 @@ -383,8 +383,11 @@ <action name="removePatient" class="org.hisp.dhis.patient.action.patient.RemovePatientAction"> - <result name="success" type="redirect">patientform.action - </result> + <result name="success" type="velocity-json"> + /dhis-web-commons/ajax/jsonResponseSuccess.vm</result> + <result name="error" type="velocity-json"> + /dhis-web-commons/ajax/jsonResponseError.vm</result> + <param name="onExceptionReturn">plainTextError</param> <param name="requiredAuthorities">F_PATIENT_DELETE</param> </action>
_______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : dhis2-devs@lists.launchpad.net Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
