------------------------------------------------------------
revno: 10793
committer: Morten Olav Hansen <[email protected]>
branch nick: dhis2
timestamp: Fri 2013-05-10 17:39:37 +0700
message:
changed to using .equals for greyfield filtering
modified:
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/utils/FormUtils.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-web/dhis-web-api/src/main/java/org/hisp/dhis/api/utils/FormUtils.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/utils/FormUtils.java 2013-05-10 09:49:29 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/utils/FormUtils.java 2013-05-10 10:39:37 +0000
@@ -97,7 +97,7 @@
{
for ( DataElementOperand operand : greyedFields )
{
- if ( dataElement == operand.getDataElement() && dataElement.getCategoryCombo() == operand.getCategoryOptionCombo().getCategoryCombo() )
+ if ( dataElement.equals( operand.getDataElement() ) && dataElement.getCategoryCombo().equals( operand.getCategoryOptionCombo().getCategoryCombo() ) )
{
return false;
}
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
