From 71a65117093abc2d7571e3325831c158645403c9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?= Date: Mon, 26 Feb 2024 16:11:38 +0100 Subject: [PATCH] Reorder Partners columns1 --- .../user/lis/ui/view/renderer/ReorderedItemsRenderer.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lis-ui/src/main/java/hu/user/lis/ui/view/renderer/ReorderedItemsRenderer.java b/lis-ui/src/main/java/hu/user/lis/ui/view/renderer/ReorderedItemsRenderer.java index 77fadec..d396035 100644 --- a/lis-ui/src/main/java/hu/user/lis/ui/view/renderer/ReorderedItemsRenderer.java +++ b/lis-ui/src/main/java/hu/user/lis/ui/view/renderer/ReorderedItemsRenderer.java @@ -29,11 +29,12 @@ public class ReorderedItemsRenderer extends AbstractRenderer implements Listitem @Override public void render(Listitem item, final Object data, final int index) throws Exception { + int mappedIndex = columnSettings[index].getIndex(); log.info("Rendering {} {} {}", item.getIndex(), item.getLabel(), data); final Listbox listbox = (Listbox) item.getParent(); final int size = listbox.getModel().getSize(); String subtype = item instanceof Listgroup ? "group" : (item instanceof Listgroupfoot ? "groupfoot" : null); - Template tm = this.resolveTemplate(listbox, item, data, columnSettings[index].getIndex(), size, "model", subtype); + Template tm = this.resolveTemplate(listbox, item, data, mappedIndex, size, "model", subtype); if (tm == null) { item.setLabel(Objects.toString(data)); item.setValue(data); @@ -94,7 +95,7 @@ public class ReorderedItemsRenderer extends AbstractRenderer implements Listitem return nli; } }); - this.addItemReference(listbox, nli, index, varnm); + this.addItemReference(listbox, nli, mappedIndex, varnm); nli.setAttribute(itervarnm, iterStatus); if (nli instanceof Listgroup && item instanceof Listgroup) { ((Listgroup) nli).setOpen(((Listgroup) item).isOpen()); @@ -107,7 +108,7 @@ public class ReorderedItemsRenderer extends AbstractRenderer implements Listitem nli.removeAttribute("$TemplateVar$"); } - this.addTemplateTracking(listbox, nli, data, index, size); + this.addTemplateTracking(listbox, nli, data, mappedIndex, size); if (nli.getValue() == null) { nli.setValue(data); } -- 2.54.0