Skip to content
Snippets Groups Projects
Commit 09fa0b01 authored by aboeckle's avatar aboeckle
Browse files

OO-4366 Fixed table column selector with mandatory columns and only one

additionally selected column
parent ffc38208
No related branches found
No related tags found
No related merge requests found
...@@ -106,6 +106,7 @@ public class FlexiTableElementImpl extends FormItemImpl implements FlexiTableEle ...@@ -106,6 +106,7 @@ public class FlexiTableElementImpl extends FormItemImpl implements FlexiTableEle
private boolean numOfRowsEnabled = true; private boolean numOfRowsEnabled = true;
private boolean showAllRowsEnabled = false; private boolean showAllRowsEnabled = false;
private boolean extendedSearchExpanded = false; private boolean extendedSearchExpanded = false;
private boolean hasAlwaysVisibleColumns = false;
private int columnLabelForDragAndDrop; private int columnLabelForDragAndDrop;
private String emptyTableMessageKey = null; private String emptyTableMessageKey = null;
...@@ -166,6 +167,10 @@ public class FlexiTableElementImpl extends FormItemImpl implements FlexiTableEle ...@@ -166,6 +167,10 @@ public class FlexiTableElementImpl extends FormItemImpl implements FlexiTableEle
enabledColumnIndex.add(Integer.valueOf(col.getColumnIndex())); enabledColumnIndex.add(Integer.valueOf(col.getColumnIndex()));
} }
} }
if(enabledColumnIndex.size() > 0 ) {
hasAlwaysVisibleColumns = true;
}
String dispatchId = component.getDispatchID(); String dispatchId = component.getDispatchID();
customButton = new FormLinkImpl(dispatchId + "_customButton", "rCustomButton", "", Link.BUTTON + Link.NONTRANSLATED); customButton = new FormLinkImpl(dispatchId + "_customButton", "rCustomButton", "", Link.BUTTON + Link.NONTRANSLATED);
...@@ -1385,12 +1390,12 @@ public class FlexiTableElementImpl extends FormItemImpl implements FlexiTableEle ...@@ -1385,12 +1390,12 @@ public class FlexiTableElementImpl extends FormItemImpl implements FlexiTableEle
} }
protected void setCustomizedColumns(UserRequest ureq, Choice visibleColsChoice) { protected void setCustomizedColumns(UserRequest ureq, Choice visibleColsChoice) {
List<Integer> visibleCols = visibleColsChoice.getSelectedRows(); List<Integer> chosenCols = visibleColsChoice.getSelectedRows();
if(visibleCols.size() > 1) { if(chosenCols.size() > 1 || hasAlwaysVisibleColumns) {
VisibleFlexiColumnsModel model = (VisibleFlexiColumnsModel)visibleColsChoice.getModel(); VisibleFlexiColumnsModel model = (VisibleFlexiColumnsModel)visibleColsChoice.getModel();
for(int i=model.getRowCount(); i-->0; ) { for(int i=model.getRowCount(); i-->0; ) {
FlexiColumnModel col = model.getObject(i); FlexiColumnModel col = model.getObject(i);
if(visibleCols.contains(Integer.valueOf(i))) { if(chosenCols.contains(Integer.valueOf(i))) {
enabledColumnIndex.add(col.getColumnIndex()); enabledColumnIndex.add(col.getColumnIndex());
} else { } else {
enabledColumnIndex.remove(col.getColumnIndex()); enabledColumnIndex.remove(col.getColumnIndex());
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment