midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-2935 New record on GridMode error on fields with DisplayLogic / IDEMPIERE-2148

This commit is contained in:
Carlos Ruiz 2015-12-14 13:20:03 -05:00
parent 488e442c98
commit 93c31a73a4
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridTabRowRenderer.java
View File

@ -17,7 +17,6 @@ import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Properties;
import org.adempiere.util.GridRowCtx; import org.adempiere.util.GridRowCtx;
import org.adempiere.webui.LayoutUtils; import org.adempiere.webui.LayoutUtils;
@ -505,9 +504,8 @@ public class GridTabRowRenderer implements RowRenderer<Object[]>, RowRendererExt
else if (DisplayType.isNumeric(gridPanelFields[i].getDisplayType())) { else if (DisplayType.isNumeric(gridPanelFields[i].getDisplayType())) {
divStyle = CELL_DIV_STYLE_ALIGN_RIGHT; divStyle = CELL_DIV_STYLE_ALIGN_RIGHT;
} }
GridRowCtx ctx = new GridRowCtx(Env.getCtx(), gridTab, rowIndex); if (!gridPanelFields[i].isDisplayedGrid()){
if (!gridPanelFields[i].isDisplayed(ctx, true)){
// IDEMPIERE-2253 // IDEMPIERE-2253
div.removeChild(component); div.removeChild(component);
} }
@ -644,12 +642,9 @@ public class GridTabRowRenderer implements RowRenderer<Object[]>, RowRendererExt
div.appendChild(popupMenu); div.appendChild(popupMenu);
popupMenu.addContextElement((XulElement) editor.getComponent()); popupMenu.addContextElement((XulElement) editor.getComponent());
} }
Properties ctx = isDetailPane() ? new GridRowCtx(Env.getCtx(), gridTab, gridTab.getCurrentRow())
: gridPanelFields[i].getVO().ctx;
//check context //check context
if (!gridPanelFields[i].isDisplayed(ctx, true)){ if (!gridPanelFields[i].isDisplayedGrid()){
// IDEMPIERE-2253 // IDEMPIERE-2253
div.removeChild(editor.getComponent()); div.removeChild(editor.getComponent());
} }