details: /erp/devel/pi/rev/dafb724d2cb9
changeset: 10575:dafb724d2cb9
user: Martin Taal <martin.taal <at> openbravo.com>
date: Fri Feb 11 15:28:28 2011 +0100
summary: solved issue with columnwidth in fkdefinition
details: /erp/devel/pi/rev/4e2bdba8f942
changeset: 10576:4e2bdba8f942
user: Martin Taal <martin.taal <at> openbravo.com>
date: Fri Feb 11 15:28:47 2011 +0100
summary: Tab with same table as parent only shows parent record now
details: /erp/devel/pi/rev/c5f0379e728d
changeset: 10577:c5f0379e728d
user: Martin Taal <martin.taal <at> openbravo.com>
date: Fri Feb 11 15:29:09 2011 +0100
summary: Small formatting change
diffstat:
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java
| 10 +++++++++-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-window.js
| 2 +-
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/ForeignKeyUIDefinition.java
| 2 +-
3 files changed, 11 insertions(+), 3 deletions(-)
diffs (51 lines):
diff -r bd69781e078e -r c5f0379e728d
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java
Fri Feb 11 15:09:33 2011 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java
Fri Feb 11 15:29:09 2011 +0100
@@ -27,6 +27,8 @@
import javax.inject.Inject;
+import org.openbravo.base.model.Entity;
+import org.openbravo.base.model.ModelProvider;
import org.openbravo.client.application.ApplicationUtils;
import org.openbravo.client.application.DynamicExpressionParser;
import
org.openbravo.client.application.window.OBViewFormComponent.FormFieldComparator;
@@ -186,7 +188,13 @@
if (parentProperty != null) {
return parentProperty;
}
- return ApplicationUtils.getParentProperty(tab,
parentTabComponent.getTab());
+ if
(tab.getTable().getId().equals(parentTabComponent.getTab().getTable().getId()))
{
+ final Entity entity =
ModelProvider.getInstance().getEntity(tab.getTable().getName());
+ parentProperty = entity.getIdProperties().get(0).getName();
+ } else {
+ parentProperty = ApplicationUtils.getParentProperty(tab,
parentTabComponent.getTab());
+ }
+ return parentProperty;
}
public String getViewForm() {
diff -r bd69781e078e -r c5f0379e728d
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-window.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-window.js
Fri Feb 11 15:09:33 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-window.js
Fri Feb 11 15:29:09 2011 +0100
@@ -89,7 +89,7 @@
if (this.command === isc.OBStandardWindow.COMMAND_NEW) {
this.viewProperties.allowDefaultEditMode = false;
}
-
this.viewState=OB.PropertyStore.get("OBUIAPP_GridConfiguration",this.windowId);
+ this.viewState = OB.PropertyStore.get("OBUIAPP_GridConfiguration",
this.windowId);
this.view = isc.OBStandardView.create(this.viewProperties);
this.addView(this.view);
this.addMember(this.view);
diff -r bd69781e078e -r c5f0379e728d
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/ForeignKeyUIDefinition.java
---
a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/ForeignKeyUIDefinition.java
Fri Feb 11 15:09:33 2011 +0100
+++
b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/ForeignKeyUIDefinition.java
Fri Feb 11 15:29:09 2011 +0100
@@ -57,7 +57,7 @@
length = field.getColumn().getLength();
}
final Property prop =
KernelUtils.getInstance().getPropertyFromColumn(field.getColumn());
- return ", width: width: isc.OBGrid.getDefaultColumnWidth(" + length + "),
displayField: '"
+ return ", width: isc.OBGrid.getDefaultColumnWidth(" + length + "),
displayField: '"
+ prop.getName() + "." + JsonConstants.IDENTIFIER + "'," +
"valueField: '" + prop.getName()
+ "'" + ", foreignKeyField: true" + super.getGridFieldProperties(field)
+ getShowHoverGridFieldSettings(field);
------------------------------------------------------------------------------
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
