From 6261d7de8c361cf68574864a65e175c2d7908d9b Mon Sep 17 00:00:00 2001
From: aboeckle <alexander.boeckle@frentix.com>
Date: Mon, 9 Dec 2019 16:45:25 +0100
Subject: [PATCH] OO-4366 Fixed always visible columns check and set minimal
selected columns from 2 to 1
---
.../impl/elements/table/FlexiTableElementImpl.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/table/FlexiTableElementImpl.java b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/table/FlexiTableElementImpl.java
index 492bab9e561..04916d8c28a 100644
--- a/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/table/FlexiTableElementImpl.java
+++ b/src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/table/FlexiTableElementImpl.java
@@ -166,12 +166,12 @@ public class FlexiTableElementImpl extends FormItemImpl implements FlexiTableEle
if(col.isDefaultVisible()) {
enabledColumnIndex.add(Integer.valueOf(col.getColumnIndex()));
}
+
+ if(hasAlwaysVisibleColumns || col.isAlwaysVisible()) {
+ hasAlwaysVisibleColumns = true;
+ }
}
- if(enabledColumnIndex.size() > 0 ) {
- hasAlwaysVisibleColumns = true;
- }
-
String dispatchId = component.getDispatchID();
customButton = new FormLinkImpl(dispatchId + "_customButton", "rCustomButton", "", Link.BUTTON + Link.NONTRANSLATED);
customButton.setTranslator(translator);
@@ -1391,7 +1391,7 @@ public class FlexiTableElementImpl extends FormItemImpl implements FlexiTableEle
protected void setCustomizedColumns(UserRequest ureq, Choice visibleColsChoice) {
List<Integer> chosenCols = visibleColsChoice.getSelectedRows();
- if(chosenCols.size() > 1 || hasAlwaysVisibleColumns) {
+ if(chosenCols.size() > 0 || hasAlwaysVisibleColumns) {
VisibleFlexiColumnsModel model = (VisibleFlexiColumnsModel)visibleColsChoice.getModel();
for(int i=model.getRowCount(); i-->0; ) {
FlexiColumnModel col = model.getObject(i);
--
GitLab