Reorder Partners columns1

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 77fadecb247cdd40a62af8c953f7a09f60e5ca16..d396035380480b7856bdcc13587f2be9401c8b0b 100644 (file)
--- 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);
             }