From fa599909a27eb6de3915e1af508d047c5d5a032e Mon Sep 17 00:00:00 2001 From: Heng Sin Low Date: Thu, 20 Nov 2008 17:18:47 +0000 Subject: [PATCH] * [2308109] WListbox doesn't support editing of non bigdecimal field * [2308105] WListbox should always re-render when row is select/deselect --- .../adempiere/webui/component/WListItemRenderer.java | 11 +++++++---- .../src/org/adempiere/webui/component/WListbox.java | 4 ++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/WListItemRenderer.java b/zkwebui/WEB-INF/src/org/adempiere/webui/component/WListItemRenderer.java index 69f327de69..440ae3a7ea 100644 --- a/zkwebui/WEB-INF/src/org/adempiere/webui/component/WListItemRenderer.java +++ b/zkwebui/WEB-INF/src/org/adempiere/webui/component/WListItemRenderer.java @@ -275,9 +275,12 @@ public class WListItemRenderer implements ListitemRenderer, EventListener, Listi listcell.appendChild(checkbox); ZkCssHelper.appendStyle(listcell, "text-align:center"); } - else if (field instanceof BigDecimal) + else if (field instanceof Number) { - DecimalFormat format = DisplayType.getNumberFormat(DisplayType.Amount); + DecimalFormat format = field instanceof BigDecimal + ? DisplayType.getNumberFormat(DisplayType.Amount) + : DisplayType.getNumberFormat(DisplayType.Integer); + // set cell value to allow sorting listcell.setValue(field.toString()); @@ -285,7 +288,7 @@ public class WListItemRenderer implements ListitemRenderer, EventListener, Listi { NumberBox numberbox = new NumberBox(false); numberbox.setFormat(format); - numberbox.setValue((BigDecimal)field); + numberbox.setValue(field); numberbox.setWidth("100px"); numberbox.setEnabled(true); numberbox.setStyle("text-align:right; " @@ -295,7 +298,7 @@ public class WListItemRenderer implements ListitemRenderer, EventListener, Listi } else { - listcell.setLabel(format.format(((BigDecimal)field).doubleValue())); + listcell.setLabel(format.format(((Number)field).doubleValue())); ZkCssHelper.appendStyle(listcell, "text-align:right"); } } diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/component/WListbox.java b/zkwebui/WEB-INF/src/org/adempiere/webui/component/WListbox.java index 0221556a0c..1143aa9281 100644 --- a/zkwebui/WEB-INF/src/org/adempiere/webui/component/WListbox.java +++ b/zkwebui/WEB-INF/src/org/adempiere/webui/component/WListbox.java @@ -1008,6 +1008,10 @@ public class WListbox extends Listbox implements TableValueChangeListener, WTabl { this.repaint(); } + else + { + this.setModel(this.getModel()); + } return; }