------------------------------------------------------------
revno: 13285
committer: Lars Helge Øverland <[email protected]>
branch nick: dhis2
timestamp: Tue 2013-12-17 20:18:45 +0100
message:
Data entry, removed unused result from action
modified:
dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/LoadFormAction.java
dhis-2/dhis-web/dhis-web-dataentry/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-dataentry/src/main/java/org/hisp/dhis/de/action/LoadFormAction.java'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/LoadFormAction.java 2013-12-09 21:32:59 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/action/LoadFormAction.java 2013-12-17 19:18:45 +0000
@@ -339,7 +339,7 @@
}
// ---------------------------------------------------------------------
- // For multi-org unit we only support custom forms
+ // For multi-org unit we only support section forms
// ---------------------------------------------------------------------
if ( multiOrganisationUnit != null && multiOrganisationUnit != 0 )
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/struts.xml'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/struts.xml 2013-12-14 14:50:17 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/struts.xml 2013-12-17 19:18:45 +0000
@@ -34,7 +34,6 @@
<result name="custom" type="velocity">/dhis-web-dataentry/customForm.vm</result>
<result name="section" type="velocity">/dhis-web-dataentry/sectionForm.vm</result>
<result name="multiorg_section" type="velocity">/dhis-web-dataentry/multiOrgSectionForm.vm</result>
- <result name="default" type="velocity">/dhis-web-dataentry/defaultForm.vm</result>
<result name="input" type="velocity">/dhis-web-dataentry/responseVoid.vm</result>
</action>
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
