From 7f8b72388b9af8d4ba22911a3f75c70133d73204 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Wed, 2 Sep 2015 11:59:49 +0200
Subject: [PATCH] OO-1667: check the input parameters before activating a
tabbed pane
---
.../core/gui/components/tabbedpane/TabbedPane.java | 11 +++++++----
.../group/ui/edit/BusinessGroupEditController.java | 1 -
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/olat/core/gui/components/tabbedpane/TabbedPane.java b/src/main/java/org/olat/core/gui/components/tabbedpane/TabbedPane.java
index 4973ac18281..e2b13e65628 100644
--- a/src/main/java/org/olat/core/gui/components/tabbedpane/TabbedPane.java
+++ b/src/main/java/org/olat/core/gui/components/tabbedpane/TabbedPane.java
@@ -260,10 +260,13 @@ public class TabbedPane extends Container implements Activateable2 {
@Override
public void activate(UserRequest ureq, List<ContextEntry> entries, StateEntry state) {
if(entries == null || entries.isEmpty()) return;
-
- int pos = entries.get(0).getOLATResourceable().getResourceableId().intValue();
- if(pos != selectedPane) {
- dispatchRequest(ureq, pos);
+
+ OLATResourceable ores = entries.get(0).getOLATResourceable();
+ if("tab".equals(ores.getResourceableTypeName())) {
+ int pos = ores.getResourceableId().intValue();
+ if(pos != selectedPane && pos >= 0 && pos < getTabCount()) {
+ dispatchRequest(ureq, pos);
+ }
}
}
}
\ No newline at end of file
diff --git a/src/main/java/org/olat/group/ui/edit/BusinessGroupEditController.java b/src/main/java/org/olat/group/ui/edit/BusinessGroupEditController.java
index b8561fcb7b9..0407035799f 100644
--- a/src/main/java/org/olat/group/ui/edit/BusinessGroupEditController.java
+++ b/src/main/java/org/olat/group/ui/edit/BusinessGroupEditController.java
@@ -317,7 +317,6 @@ public class BusinessGroupEditController extends BasicController implements Cont
}
@Override
- //fxdiff BAKS-7 Resume function
public void activate(UserRequest ureq, List<ContextEntry> entries, StateEntry state) {
if(entries == null || entries.isEmpty() || tabbedPane == null) return;
tabbedPane.activate(ureq, entries, state);
--
GitLab