------------------------------------------------------------
revno: 16226
committer: Lars Helge Overland <larshe...@gmail.com>
branch nick: dhis2
timestamp: Thu 2014-07-24 22:14:53 +0200
message:
Extra check for custom html form in expression service
modified:
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataentryform/DefaultDataEntryFormService.java
--
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/dataentryform/DefaultDataEntryFormService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataentryform/DefaultDataEntryFormService.java 2014-07-09 13:22:04 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataentryform/DefaultDataEntryFormService.java 2014-07-24 20:14:53 +0000
@@ -371,7 +371,7 @@
public Set<DataElement> getDataElementsInDataEntryForm( DataSet dataSet )
{
- if ( dataSet == null || dataSet.getDataEntryForm() == null )
+ if ( dataSet == null || !dataSet.hasDataEntryForm() )
{
return null;
}
@@ -413,7 +413,7 @@
public Set<DataElementOperand> getOperandsInDataEntryForm( DataSet dataSet )
{
- if ( dataSet == null || dataSet.getDataEntryForm() == null )
+ if ( dataSet == null || !dataSet.hasDataEntryForm() )
{
return null;
}
_______________________________________________
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
