Skip to content
Snippets Groups Projects
Commit 63284d77 authored by srosse's avatar srosse
Browse files

OO-1586: sort separately the user properties

parent 932fd665
No related branches found
No related tags found
No related merge requests found
...@@ -36,9 +36,7 @@ import org.olat.group.ui.main.MemberListTableModel.Cols; ...@@ -36,9 +36,7 @@ import org.olat.group.ui.main.MemberListTableModel.Cols;
* *
*/ */
public class MemberListTableSort extends SortableFlexiTableModelDelegate<MemberView> { public class MemberListTableSort extends SortableFlexiTableModelDelegate<MemberView> {
public MemberListTableSort(SortKey orderBy, SortableFlexiTableDataModel<MemberView> tableModel, Locale locale) { public MemberListTableSort(SortKey orderBy, SortableFlexiTableDataModel<MemberView> tableModel, Locale locale) {
super(orderBy, tableModel, locale); super(orderBy, tableModel, locale);
} }
...@@ -46,16 +44,20 @@ public class MemberListTableSort extends SortableFlexiTableModelDelegate<MemberV ...@@ -46,16 +44,20 @@ public class MemberListTableSort extends SortableFlexiTableModelDelegate<MemberV
@Override @Override
protected void sort(List<MemberView> rows) { protected void sort(List<MemberView> rows) {
int columnIndex = getColumnIndex(); int columnIndex = getColumnIndex();
Cols column = Cols.values()[columnIndex]; if(columnIndex >= AbstractMemberListController.USER_PROPS_OFFSET) {
switch(column) { super.sort(rows);
case role: } else {
Collections.sort(rows, new RoleMemberViewComparator()); Cols column = Cols.values()[columnIndex];
break; switch(column) {
case groups: case role:
Collections.sort(rows, new GroupMemberViewComparator(getCollator())); Collections.sort(rows, new RoleMemberViewComparator());
break; break;
default: { case groups:
super.sort(rows); Collections.sort(rows, new GroupMemberViewComparator(getCollator()));
break;
default: {
super.sort(rows);
}
} }
} }
} }
......
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