Skip to content

Commit 226f22d

Browse files
authored
SAK-32389 - Have to protect the variable in VM so no error when logged (sakaiproject#4650)
out
1 parent 823d061 commit 226f22d

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/handlers/SiteHandler.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -904,7 +904,7 @@ public void includeTabs(PortalRenderContext rcontext, HttpServletRequest req,
904904
}
905905

906906
rcontext.put("tabDisplayLabel", tabDisplayLabel);
907-
rcontext.put("toolsCollapsed", toolsCollapsed);
907+
rcontext.put("toolsCollapsed", Boolean.valueOf(toolsCollapsed));
908908

909909
SiteView siteView = portal.getSiteHelper().getSitesView(
910910
SiteView.View.DHTML_MORE_VIEW, req, session, siteId);

portal/portal-render-engine-impl/impl/src/webapp/vm/morpheus/includeStandardHead.vm

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"siteId": "$!{siteId}",
4848
"siteTitle": "$!{siteTitle}",
4949
"shortDescription" : "$!{shortDescription}",
50-
"toolsCollapsed": ${toolsCollapsed},
50+
"toolsCollapsed": #if ($toolsCollapsed) true #else false #end,
5151
"locale": "$!{locale}",
5252
"user": {
5353
"id": "$!{userId}",

0 commit comments

Comments
 (0)