------------------------------------------------------------
revno: 15905
committer: Lars Helge Overland <[email protected]>
branch nick: dhis2
timestamp: Mon 2014-06-30 09:40:07 +0200
message:
FormUtils, using form name with fallback to name for labels
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElement.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/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-api/src/main/java/org/hisp/dhis/dataelement/DataElement.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElement.java 2014-06-26 09:29:30 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElement.java 2014-06-30 07:40:07 +0000
@@ -403,7 +403,7 @@
public String getDisplayFormName()
{
- return (displayFormName != null && !displayFormName.trim().isEmpty()) ? displayFormName : formName;
+ return displayFormName != null && !displayFormName.trim().isEmpty() ? displayFormName : formName;
}
public void setDisplayFormName( String displayFormName )
=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/FormUtils.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/FormUtils.java 2014-05-22 12:40:24 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/utils/FormUtils.java 2014-06-30 07:40:07 +0000
@@ -200,11 +200,11 @@
if ( categoryOptionCombo.isDefault() )
{
- field.setLabel( dataElement.getDisplayName() );
+ field.setLabel( dataElement.getFormNameFallback() );
}
else
{
- field.setLabel( dataElement.getDisplayName() + " " + categoryOptionCombo.getDisplayName() );
+ field.setLabel( dataElement.getFormNameFallback() + " " + categoryOptionCombo.getDisplayName() );
}
field.setDataElement( dataElement.getUid() );
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
