From b164db7531742edad6c20b34d857f4b95e6398a6 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Wed, 20 Apr 2016 09:04:25 +0200
Subject: [PATCH] OO-1996: add secondary sorting to the catalog / my courses
order by for default
---
.../manager/RepositoryEntryMyCourseQueries.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/olat/repository/manager/RepositoryEntryMyCourseQueries.java b/src/main/java/org/olat/repository/manager/RepositoryEntryMyCourseQueries.java
index 7be7a27b10d..89d25a9f955 100644
--- a/src/main/java/org/olat/repository/manager/RepositoryEntryMyCourseQueries.java
+++ b/src/main/java/org/olat/repository/manager/RepositoryEntryMyCourseQueries.java
@@ -506,7 +506,6 @@ public class RepositoryEntryMyCourseQueries {
} else {
sb.append(" order by lower(v.displayname) desc, lifecycle.validFrom desc nulls last, lower(v.externalRef) desc nulls last");
}
- appendAsc(sb, asc);
break;
case lifecycle:
sb.append(" order by lifecycle.validFrom ");
@@ -576,8 +575,11 @@ public class RepositoryEntryMyCourseQueries {
appendAsc(sb, asc).append(" nulls last, lower(v.displayname) asc");
break;
default:
- sb.append(" order by lower(v.displayname)");
- appendAsc(sb, asc);
+ if(asc) {
+ sb.append(" order by lower(v.displayname) asc, lifecycle.validFrom desc nulls last, lower(v.externalRef) asc nulls last");
+ } else {
+ sb.append(" order by lower(v.displayname) desc, lifecycle.validFrom desc nulls last, lower(v.externalRef) desc nulls last");
+ }
break;
}
}
--
GitLab