From 93c31a73a453c57574b02073c984cc752e59c81e Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Mon, 14 Dec 2015 13:20:03 -0500 Subject: [PATCH] IDEMPIERE-2935 New record on GridMode error on fields with DisplayLogic / IDEMPIERE-2148 --- .../webui/adwindow/GridTabRowRenderer.java | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridTabRowRenderer.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridTabRowRenderer.java index e3d4afc727..02c6ec435e 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridTabRowRenderer.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridTabRowRenderer.java @@ -17,7 +17,6 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Map.Entry; -import java.util.Properties; import org.adempiere.util.GridRowCtx; import org.adempiere.webui.LayoutUtils; @@ -505,9 +504,8 @@ public class GridTabRowRenderer implements RowRenderer, RowRendererExt else if (DisplayType.isNumeric(gridPanelFields[i].getDisplayType())) { divStyle = CELL_DIV_STYLE_ALIGN_RIGHT; } - - GridRowCtx ctx = new GridRowCtx(Env.getCtx(), gridTab, rowIndex); - if (!gridPanelFields[i].isDisplayed(ctx, true)){ + + if (!gridPanelFields[i].isDisplayedGrid()){ // IDEMPIERE-2253 div.removeChild(component); } @@ -644,12 +642,9 @@ public class GridTabRowRenderer implements RowRenderer, RowRendererExt div.appendChild(popupMenu); popupMenu.addContextElement((XulElement) editor.getComponent()); } - - - Properties ctx = isDetailPane() ? new GridRowCtx(Env.getCtx(), gridTab, gridTab.getCurrentRow()) - : gridPanelFields[i].getVO().ctx; + //check context - if (!gridPanelFields[i].isDisplayed(ctx, true)){ + if (!gridPanelFields[i].isDisplayedGrid()){ // IDEMPIERE-2253 div.removeChild(editor.getComponent()); }