Skip to content
Snippets Groups Projects
Commit 2015da0e authored by srosse's avatar srosse
Browse files

OO-2170: fix rs, minimize access to getUserSession()

parent bdd443f6
No related branches found
No related tags found
No related merge requests found
...@@ -29,6 +29,7 @@ import org.olat.core.gui.control.navigation.SiteDefinitions; ...@@ -29,6 +29,7 @@ import org.olat.core.gui.control.navigation.SiteDefinitions;
import org.olat.core.gui.control.navigation.SiteInstance; import org.olat.core.gui.control.navigation.SiteInstance;
import org.olat.core.gui.control.navigation.SiteSecurityCallback; import org.olat.core.gui.control.navigation.SiteSecurityCallback;
import org.olat.core.util.StringHelper; import org.olat.core.util.StringHelper;
import org.olat.core.util.UserSession;
import org.olat.course.site.model.CourseSiteConfiguration; import org.olat.course.site.model.CourseSiteConfiguration;
import org.olat.course.site.model.LanguageConfiguration; import org.olat.course.site.model.LanguageConfiguration;
...@@ -88,10 +89,13 @@ public class CourseSiteDef extends AbstractSiteDefinition implements SiteDefinit ...@@ -88,10 +89,13 @@ public class CourseSiteDef extends AbstractSiteDefinition implements SiteDefinit
String secCallbackBeanId = config.getSecurityCallbackBeanId(); String secCallbackBeanId = config.getSecurityCallbackBeanId();
SiteSecurityCallback siteSecCallback = (SiteSecurityCallback)CoreSpringFactory.getBean(secCallbackBeanId); SiteSecurityCallback siteSecCallback = (SiteSecurityCallback)CoreSpringFactory.getBean(secCallbackBeanId);
UserSession usess = ureq.getUserSession();
if(usess == null || usess.getRoles() == null) return null;
boolean canSeeToolController = ureq.getUserSession().getRoles().isAuthor() boolean canSeeToolController = usess.getRoles().isAuthor()
|| ureq.getUserSession().getRoles().isOLATAdmin() || usess.getRoles().isOLATAdmin()
|| ureq.getUserSession().getRoles().isInstitutionalResourceManager(); || usess.getRoles().isInstitutionalResourceManager();
boolean showToolController = true; boolean showToolController = true;
if (!canSeeToolController && !courseConfig.isToolbar()) { if (!canSeeToolController && !courseConfig.isToolbar()) {
showToolController = false; showToolController = false;
......
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