From 488e442c98dc97bfffd075750ceca45431f8ecca Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Mon, 14 Dec 2015 13:18:31 -0500 Subject: [PATCH] IDEMPIERE-2935 New record on GridMode error on fields with DisplayLogic / revert previous approach - found this was caused by IDEMPIERE-2148 --- .../webui/adwindow/GridTabRowRenderer.java | 21 ---------------- .../webui/util/GridTabDataBinder.java | 25 ------------------- 2 files changed, 46 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 3e3ae94817..e3d4afc727 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 @@ -861,25 +861,4 @@ public class GridTabRowRenderer implements RowRenderer, RowRendererExt Events.sendEvent(gridPanel, new Event("onSelectRow", gridPanel, checkBox)); } } - - /** - * Check if the new value in the field, changes the display logic in the dependant fields - * @param dependantFields - */ - public void checkDependants(ArrayList dependantFields){ - - for (GridField field : dependantFields) { - if (field == null) - continue; - WEditor editor = editors.get(field); - if (editor == null) - continue; - boolean isEditable = field.isEditableGrid(true); - editor.setReadWrite(isEditable); - if (isEditable) - gridPanel.refresh(gridTab); - } - - } - } diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/GridTabDataBinder.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/GridTabDataBinder.java index 3dd8b50743..19a2a6b905 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/GridTabDataBinder.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/util/GridTabDataBinder.java @@ -12,14 +12,11 @@ *****************************************************************************/ package org.adempiere.webui.util; -import java.util.ArrayList; import java.util.Properties; import java.util.logging.Level; import org.adempiere.base.Core; import org.adempiere.exceptions.AdempiereException; -import org.adempiere.webui.adwindow.GridTabRowRenderer; -import org.adempiere.webui.component.Grid; import org.adempiere.webui.editor.WEditor; import org.adempiere.webui.event.ValueChangeEvent; import org.adempiere.webui.event.ValueChangeListener; @@ -29,7 +26,6 @@ import org.compiere.model.GridTable; import org.compiere.util.CLogger; import org.compiere.util.Env; import org.compiere.util.Trx; -import org.zkoss.zul.RowRenderer; /** * Transfer data from editor to GridTab @@ -169,27 +165,6 @@ public class GridTabDataBinder implements ValueChangeListener { } } } - - //Checks if the change in a field modifies the display logic in the dependant fields - Object source = e.getSource(); - if (source != null && source instanceof WEditor) { - WEditor editor = (WEditor) source; - ArrayList dependants = gridTab.getDependantFields(editor.getColumnName()); - if (dependants != null - && !dependants.isEmpty() - && editor.getComponent() != null //Editor - && editor.getComponent().getParent() != null //Cell - && editor.getComponent().getParent().getParent() != null //Row - && editor.getComponent().getParent().getParent().getParent() != null //Rows - && editor.getComponent().getParent().getParent().getParent().getParent() != null //Grid - && editor.getComponent().getParent().getParent().getParent().getParent() instanceof Grid) { - Grid listBox = (Grid) editor.getComponent().getParent().getParent().getParent().getParent(); - RowRenderer renderer = listBox.getRowRenderer(); - GridTabRowRenderer gtr = (GridTabRowRenderer)renderer; - if( gtr != null ) - gtr.checkDependants(dependants); - } - } } // ValueChange