From c544f1ee2cad86573898a448777f5b90ba552b59 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Wed, 20 Nov 2013 16:57:50 -0500 Subject: [PATCH] IDEMPIERE-1459 Improving performance on InfoWindows / thanks to Heng Sin --- .../src/org/adempiere/webui/info/InfoProductWindow.java | 8 ++++---- .../WEB-INF/src/org/adempiere/webui/info/InfoWindow.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoProductWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoProductWindow.java index 403f4edf35..f941aaea36 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoProductWindow.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoProductWindow.java @@ -163,7 +163,7 @@ public class InfoProductWindow extends InfoWindow { warehouseTbl.setMultiSelection(false); warehouseTbl.setShowTotals(true); warehouseTbl.autoSize(); - warehouseTbl.getModel().addTableModelListener(this); +// warehouseTbl.getModel().addTableModelListener(this); ColumnInfo[] s_layoutSubstitute = new ColumnInfo[]{ new ColumnInfo(Msg.translate(Env.getCtx(), "Warehouse"), "orgname", String.class), @@ -182,7 +182,7 @@ public class InfoProductWindow extends InfoWindow { m_sqlSubstitute = substituteTbl.prepareTable(s_layoutSubstitute, s_sqlFrom, s_sqlWhere, false, "M_PRODUCT_SUBSTITUTERELATED_V"); substituteTbl.setMultiSelection(false); substituteTbl.autoSize(); - substituteTbl.getModel().addTableModelListener(this); +// substituteTbl.getModel().addTableModelListener(this); ColumnInfo[] s_layoutRelated = new ColumnInfo[]{ new ColumnInfo(Msg.translate(Env.getCtx(), "Warehouse"), "orgname", String.class), @@ -201,7 +201,7 @@ public class InfoProductWindow extends InfoWindow { m_sqlRelated = relatedTbl.prepareTable(s_layoutRelated, s_sqlFrom, s_sqlWhere, false, "M_PRODUCT_SUBSTITUTERELATED_V"); relatedTbl.setMultiSelection(false); relatedTbl.autoSize(); - relatedTbl.getModel().addTableModelListener(this); +// relatedTbl.getModel().addTableModelListener(this); //Available to Promise Tab m_tableAtp = ListboxFactory.newDataTable(); @@ -227,7 +227,7 @@ public class InfoProductWindow extends InfoWindow { m_sqlProductprice = productpriceTbl.prepareTable(s_layoutProductPrice, s_sqlFrom, s_sqlWhere, false, "pp") + " ORDER BY plv.ValidFrom DESC"; productpriceTbl.setMultiSelection(false); productpriceTbl.autoSize(); - productpriceTbl.getModel().addTableModelListener(this); +// productpriceTbl.getModel().addTableModelListener(this); tabbedPane = new Tabbox(); tabbedPane.setHeight("100%"); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java index b06d2d376a..f10cc1470f 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/info/InfoWindow.java @@ -822,7 +822,7 @@ public class InfoWindow extends InfoPanel implements ValueChangeListener, EventL @Override protected boolean hasZoom() { - return !isLookup() && infoWindow != null && !infoWindow.getAD_Table().isView(); + return !isLookup() && infoWindow != null && !MTable.get(Env.getCtx(), infoWindow.getAD_Table_ID()).isView(); } @Override