From 0c47adcd7882d4a5f3816618982ec53a88b17f61 Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Thu, 7 Jan 2021 15:52:50 +0100
Subject: [PATCH] OO-5183: fallback to a default tab if nothing currently
visible
---
.../OverviewRepositoryListController.java | 34 +++++++++++--------
1 file changed, 20 insertions(+), 14 deletions(-)
diff --git a/src/main/java/org/olat/repository/ui/list/OverviewRepositoryListController.java b/src/main/java/org/olat/repository/ui/list/OverviewRepositoryListController.java
index e5d11a0a41f..69df96a2f28 100644
--- a/src/main/java/org/olat/repository/ui/list/OverviewRepositoryListController.java
+++ b/src/main/java/org/olat/repository/ui/list/OverviewRepositoryListController.java
@@ -181,18 +181,7 @@ public class OverviewRepositoryListController extends BasicController implements
public void activate(UserRequest ureq, List<ContextEntry> entries, StateEntry state) {
if(entries == null || entries.isEmpty()) {
if(currentCtrl == null) {
- if(isGuestOnly) {
- doOpenMyCourses(ureq);
- segmentView.select(myCourseLink);
- } else {
- boolean markEmpty = doOpenMark(ureq).isEmpty();
- if(markEmpty) {
- doOpenMyCourses(ureq);
- segmentView.select(myCourseLink);
- } else {
- segmentView.select(favoriteLink);
- }
- }
+ activateDefault(ureq);
}
if(favoritDirty && markedCtrl != null) {
@@ -223,12 +212,16 @@ public class OverviewRepositoryListController extends BasicController implements
if(ctrl != null) {
ctrl.activate(ureq, entries, entry.getTransientState());
segmentView.select(catalogLink);
+ } else if(currentCtrl == null) {
+ activateDefault(ureq);
}
} else if("Curriculum".equalsIgnoreCase(segment)) {
CurriculumListController ctrl = doOpenCurriculum(ureq);
if(ctrl != null) {
ctrl.activate(ureq, subEntries, entry.getTransientState());
segmentView.select(curriculumLink);
+ } else if(currentCtrl == null) {
+ activateDefault(ureq);
}
} else if("Search".equalsIgnoreCase(segment) && searchCourseLink != null) {
doOpenSearchCourses(ureq).activate(ureq, subEntries, entry.getTransientState());
@@ -237,9 +230,22 @@ public class OverviewRepositoryListController extends BasicController implements
doOpenClosedCourses(ureq).activate(ureq, subEntries, entry.getTransientState());
segmentView.select(closedCourseLink);
} else {
- //default if the others fail
- doOpenMyCourses(ureq).activate(ureq, subEntries, entry.getTransientState());
+ activateDefault(ureq);
+ }
+ }
+ }
+
+ private void activateDefault(UserRequest ureq) {
+ if(isGuestOnly) {
+ doOpenMyCourses(ureq);
+ segmentView.select(myCourseLink);
+ } else {
+ boolean markEmpty = doOpenMark(ureq).isEmpty();
+ if(markEmpty) {
+ doOpenMyCourses(ureq);
segmentView.select(myCourseLink);
+ } else {
+ segmentView.select(favoriteLink);
}
}
}
--
GitLab