From 0baf3ac96603982f7e74a0de4f0300e95eaa8ecc Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Wed, 17 Oct 2018 16:22:55 +0200
Subject: [PATCH] OO-3298: fix RS in sort of table
---
.../admin/user/course/CourseOverviewController.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/olat/admin/user/course/CourseOverviewController.java b/src/main/java/org/olat/admin/user/course/CourseOverviewController.java
index b6c938df68b..8e04e527f71 100644
--- a/src/main/java/org/olat/admin/user/course/CourseOverviewController.java
+++ b/src/main/java/org/olat/admin/user/course/CourseOverviewController.java
@@ -170,14 +170,14 @@ public class CourseOverviewController extends BasicController {
courseListCtr.addColumnDescriptor(new CustomRenderColumnDescriptor(MSCols.role.i18n(), MSCols.role.ordinal(), null, getLocale(), ColumnDescriptor.ALIGNMENT_LEFT, roleRenderer){
@Override
public int compareTo(int rowa, int rowb) {
- CourseMemberView cmv1 = (CourseMemberView)table.getTableDataModel().getValueAt(rowa,dataColumn);
- CourseMemberView cmv2 = (CourseMemberView)table.getTableDataModel().getValueAt(rowb,dataColumn);
- if(cmv1 == null || cmv1.getMembership() == null) {
+ CourseMembership cmv1 = (CourseMembership)table.getTableDataModel().getValueAt(rowa,dataColumn);
+ CourseMembership cmv2 = (CourseMembership)table.getTableDataModel().getValueAt(rowb,dataColumn);
+ if(cmv1 == null) {
return -1;
- } else if(cmv2 == null || cmv2.getMembership() == null) {
+ } else if(cmv2 == null) {
return 1;
}
- return membershipComparator.compare(cmv1.getMembership(), cmv2.getMembership());
+ return membershipComparator.compare(cmv1, cmv2);
}
});
courseListCtr.addColumnDescriptor(new DefaultColumnDescriptor(MSCols.firstTime.i18n(), MSCols.firstTime.ordinal(), null, getLocale()));
--
GitLab