From eaa4fe6662b97902acbf687f9ccd771dae764db5 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Tue, 17 Jun 2014 11:28:37 +0200
Subject: [PATCH] OO-986: fix resume on dynamic tab
---
.../core/commons/fullWebApp/BaseFullWebappController.java | 7 +++----
.../olat/core/commons/fullWebApp/_content/nav_tabs.html | 2 +-
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/olat/core/commons/fullWebApp/BaseFullWebappController.java b/src/main/java/org/olat/core/commons/fullWebApp/BaseFullWebappController.java
index a906368bf53..98247e39f29 100644
--- a/src/main/java/org/olat/core/commons/fullWebApp/BaseFullWebappController.java
+++ b/src/main/java/org/olat/core/commons/fullWebApp/BaseFullWebappController.java
@@ -294,8 +294,7 @@ public class BaseFullWebappController extends BasicController implements ChiefCo
// Inline translation interceptor. when the translation tool is enabled it
// will start the translation tool in translation mode, if the overlay
// feature is enabled it will start in customizing mode
- // fxdiff: allow user-managers to use the inline translation also. TODO:
- // do this with a proper right-mgmt!
+ // fxdiff: allow user-managers to use the inline translation also.
if (ureq.getUserSession().isAuthenticated()
&& (ureq.getUserSession().getRoles().isOLATAdmin() || ureq.getUserSession().getRoles().isUserManager())
&& (I18nModule.isTransToolEnabled() || I18nModule.isOverlayEnabled())) {
@@ -461,7 +460,7 @@ public class BaseFullWebappController extends BasicController implements ChiefCo
private void initializeDefaultSite(UserRequest ureq) {
if (sites != null && sites.size() > 0
- && curSite == null
+ && curSite == null && curDTab == null
&& contentCtrl == null) {
SiteInstance s = sites.get(0);
//activate site only if no content was set -> allow content before activation of default site.
@@ -1168,7 +1167,7 @@ public class BaseFullWebappController extends BasicController implements ChiefCo
*
* @return
*/
- public boolean isCanCloseDTab(DTab dtab) {
+ public boolean isCanCloseDTab() {
//can close
return (sites != null && !sites.isEmpty()) || (dtabs != null && dtabs.size() > 1);
}
diff --git a/src/main/java/org/olat/core/commons/fullWebApp/_content/nav_tabs.html b/src/main/java/org/olat/core/commons/fullWebApp/_content/nav_tabs.html
index aefe35b9f95..54635978daa 100644
--- a/src/main/java/org/olat/core/commons/fullWebApp/_content/nav_tabs.html
+++ b/src/main/java/org/olat/core/commons/fullWebApp/_content/nav_tabs.html
@@ -7,7 +7,7 @@
<li class="#if($tabhelper.isDTabActive($dtab)) active #end $!navel.getIconCSSClass()">
$r.render("a$postfix")
- #if($tabhelper.isCanCloseDTab($dtab))
+ #if($tabhelper.isCanCloseDTab())
$r.render("c$postfix") ## close link has class b_nav_tab_close
#end
</li>
--
GitLab