details: https://code.openbravo.com/erp/devel/pi/rev/ed84b3d4f8e4
changeset: 18165:ed84b3d4f8e4
user: Martin Taal <martin.taal <at> openbravo.com>
date: Tue Oct 09 00:31:04 2012 +0200
summary: Fixes issue 21506: Error adding a property.path field on status bar
Handle property fields in the status bar
diffstat:
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFieldHandler.java
| 17 +++++++--
src-db/database/sourcedata/AD_FIELD.xml
| 2 +-
2 files changed, 14 insertions(+), 5 deletions(-)
diffs (53 lines):
diff -r 91e87b1a927d -r ed84b3d4f8e4
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFieldHandler.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFieldHandler.java
Mon Oct 08 18:27:04 2012 +0200
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFieldHandler.java
Tue Oct 09 00:31:04 2012 +0200
@@ -26,6 +26,8 @@
import java.util.Map;
import org.apache.log4j.Logger;
+import org.openbravo.base.model.Entity;
+import org.openbravo.base.model.ModelProvider;
import org.openbravo.base.model.Property;
import org.openbravo.base.model.domaintype.ForeignKeyDomainType;
import org.openbravo.client.application.ApplicationUtils;
@@ -368,6 +370,9 @@
}
private void processStatusBarFields(List<OBViewFieldDefinition> viewFields,
List<Field> adFields) {
+ final Entity entity = ModelProvider.getInstance().getEntityByTableId(
+ getTab().getTable().getId());
+
if (statusBarFields != null) {
return;
}
@@ -382,10 +387,14 @@
continue;
}
- final Property property =
KernelUtils.getInstance().getPropertyFromColumn(field.getColumn(),
- false);
-
- statusBarFields.add(property.getName());
+ final Property property;
+ if (field.getProperty() != null) {
+ property = DalUtil.getPropertyFromPath(entity, field.getProperty());
+ statusBarFields.add(field.getProperty().replace(DalUtil.DOT,
DalUtil.FIELDSEPARATOR));
+ } else {
+ property =
KernelUtils.getInstance().getPropertyFromColumn(field.getColumn(), false);
+ statusBarFields.add(property.getName());
+ }
final OBViewField viewField = new OBViewField();
viewField.setField(field);
diff -r 91e87b1a927d -r ed84b3d4f8e4 src-db/database/sourcedata/AD_FIELD.xml
--- a/src-db/database/sourcedata/AD_FIELD.xml Mon Oct 08 18:27:04 2012 +0200
+++ b/src-db/database/sourcedata/AD_FIELD.xml Tue Oct 09 00:31:04 2012 +0200
@@ -181074,7 +181074,7 @@
<!--32F5F85430DF4FF499FF4485C69DEB9E-->
<AD_COLUMN_ID><![CDATA[744D56EC1783443EA8499498121C551A]]></AD_COLUMN_ID>
<!--32F5F85430DF4FF499FF4485C69DEB9E-->
<IGNOREINWAD><![CDATA[N]]></IGNOREINWAD>
<!--32F5F85430DF4FF499FF4485C69DEB9E-->
<ISDISPLAYED><![CDATA[Y]]></ISDISPLAYED>
-<!--32F5F85430DF4FF499FF4485C69DEB9E--> <DISPLAYLOGIC><![CDATA[@ad_column_id@
! '']]></DISPLAYLOGIC>
+<!--32F5F85430DF4FF499FF4485C69DEB9E--> <DISPLAYLOGIC><![CDATA[@ad_column_id@
! '' | @property@!'']]></DISPLAYLOGIC>
<!--32F5F85430DF4FF499FF4485C69DEB9E-->
<DISPLAYLENGTH><![CDATA[1]]></DISPLAYLENGTH>
<!--32F5F85430DF4FF499FF4485C69DEB9E--> <ISREADONLY><![CDATA[N]]></ISREADONLY>
<!--32F5F85430DF4FF499FF4485C69DEB9E--> <SEQNO><![CDATA[120]]></SEQNO>
------------------------------------------------------------------------------
Don't let slow site performance ruin your business. Deploy New Relic APM
Deploy New Relic app performance management and know exactly
what is happening inside your Ruby, Python, PHP, Java, and .NET app
Try New Relic at no cost today and get our sweet Data Nerd shirt too!
http://p.sf.net/sfu/newrelic-dev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
