Author: phuong_vu Date: 2011-10-25 23:29:07 -0400 (Tue, 25 Oct 2011) New Revision: 7882 Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarGroupPortlet.gtmpl portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarSitePortlet.gtmpl Log: GTNPORTAL-2198 NPE when node label's length is more than 60 Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarGroupPortlet.gtmpl =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarGroupPortlet.gtmpl 2011-10-26 03:23:17 UTC (rev 7881) +++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarGroupPortlet.gtmpl 2011-10-26 03:29:07 UTC (rev 7882) @@ -51,9 +51,9 @@ String icon = node.getIcon(); if(icon == null) icon = "DefaultPageIcon"; boolean toolong = (node.getEncodedResolvedLabel().length() > 60); - String label = ( toolong ? node.getEncodedResolvedLabel().substring(0, 57) + "..." : node.getEncodedResolvedLabel()); - String title = ""; - if(toolong) title = "title='$node.encodedResolvedLabel'"; + String label = ( toolong ? node.getEncodedResolvedLabel().substring(0, 57) + "..." : node.getEncodedResolvedLabel()); + String title = ""; + if(toolong) title = "title='" + node.getEncodedResolvedLabel() + "'"; else title = ""; def getNodeURL = ""; Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarSitePortlet.gtmpl =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarSitePortlet.gtmpl 2011-10-26 03:23:17 UTC (rev 7881) +++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarSitePortlet.gtmpl 2011-10-26 03:29:07 UTC (rev 7882) @@ -1,7 +1,7 @@ <% import org.exoplatform.web.application.JavascriptManager; import org.exoplatform.portal.webui.util.Util ; - import org.gatein.common.text.EntityEncoder; + import org.gatein.common.text.EntityEncoder; import org.exoplatform.commons.utils.HTMLEntityEncoder; import org.exoplatform.portal.mop.user.UserNode; import javax.portlet.MimeResponse; @@ -90,8 +90,8 @@ if(icon == null) icon = "DefaultPageIcon"; boolean toolong = (node.getEncodedResolvedLabel().length() > 60); String label = ( toolong ? node.getEncodedResolvedLabel().substring(0, 57) + "..." : node.getEncodedResolvedLabel()); - String title = ""; - if(toolong) title = "title='$node.encodedResolvedLabel()'"; + String title = ""; + if(toolong) title = "title='" + node.getEncodedResolvedLabel() + "'"; else title = ""; def getNodeURL = "";