From 647afa5f4117e69f1de030c830bc044fd4264feb Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Mon, 18 Feb 2019 17:08:16 +0100
Subject: [PATCH] OO-3885: propagate order by by reset and multi select
preloading
---
.../impl/elements/table/FlexiTableElementImpl.java | 8 ++++----
1 file changed, 4 insertions(+), 4 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 f0026a4a847..07b2313aad2 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
@@ -1604,10 +1604,10 @@ public class FlexiTableElementImpl extends FormItemImpl implements FlexiTableEle
resetInternComponents();
if(dataModel instanceof FlexiTableDataSource) {
((FlexiTableDataSource<?>)dataModel).clear();
- ((FlexiTableDataSource<?>)dataModel).load(null, null, null, 0, getPageSize());
+ ((FlexiTableDataSource<?>)dataModel).load(null, null, null, 0, getPageSize(), orderBy);
} else {
dataSource.clear();
- dataSource.load(null, null, null, 0, getPageSize());
+ dataSource.load(null, null, null, 0, getPageSize(), orderBy);
}
} else {
getRootForm().fireFormEvent(ureq, new FlexiTableSearchEvent(this, FormEvent.ONCLICK));
@@ -1619,9 +1619,9 @@ public class FlexiTableElementImpl extends FormItemImpl implements FlexiTableEle
if(allSelectedNeedLoadOfWholeModel && dataSource != null) {
//ensure the whole data model is loaded
if(dataModel instanceof FlexiTableDataSource) {
- ((FlexiTableDataSource<?>)dataModel).load(getSearchText(), getSelectedFilters(), getConditionalQueries(), 0, -1);
+ ((FlexiTableDataSource<?>)dataModel).load(getSearchText(), getSelectedFilters(), getConditionalQueries(), 0, -1, orderBy);
} else {
- dataSource.load(getSearchText(), getSelectedFilters(), getConditionalQueries(), 0, -1);
+ dataSource.load(getSearchText(), getSelectedFilters(), getConditionalQueries(), 0, -1, orderBy);
}
Set<Integer> allIndex = new HashSet<>();
--
GitLab