Author: ndkhoiits Date: 2011-08-14 00:49:01 -0400 (Sun, 14 Aug 2011) New Revision: 7091 Modified: portal/trunk/portlet/dashboard/src/main/webapp/groovy/dashboard/webui/component/UITabPaneDashboard.gtmpl portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl Log: GTNPORTAL-2009 NPE when add new dashboard page having label is null Modified: portal/trunk/portlet/dashboard/src/main/webapp/groovy/dashboard/webui/component/UITabPaneDashboard.gtmpl =================================================================== --- portal/trunk/portlet/dashboard/src/main/webapp/groovy/dashboard/webui/component/UITabPaneDashboard.gtmpl 2011-08-14 04:45:02 UTC (rev 7090) +++ portal/trunk/portlet/dashboard/src/main/webapp/groovy/dashboard/webui/component/UITabPaneDashboard.gtmpl 2011-08-14 04:49:01 UTC (rev 7091) @@ -27,10 +27,10 @@ <% int i = 0; for(UserNode node : nodes){ - def tabLabel = node.getLabel(); + def tabLabel = node.getResolvedLabel(); if ("Tab_Default".equals(node.getName())) { - tabLabel = _ctx.appRes("UIUserToolBarDashboard.page." + node.getLabel()); + tabLabel = _ctx.appRes("UIUserToolBarDashboard.page." + tabLabel); } EntityEncoder encoder = EntityEncoder.FULL; tabLabel = encoder.encode(tabLabel); Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl =================================================================== --- portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl 2011-08-14 04:45:02 UTC (rev 7090) +++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl 2011-08-14 04:49:01 UTC (rev 7091) @@ -43,10 +43,10 @@ String href = Util.getPortalRequestContext().getPortalURI() + node.getURI(); String icon = node.getIcon(); if(icon == null) icon = "DefaultPageIcon"; - def resolvedLabel = node.getLabel(); + def resolvedLabel = node.getResolvedLabel(); if ("Tab_Default".equals(node.getName())) { - resolvedLabel = _ctx.appRes("UIUserToolBarDashboard.page." + node.getLabel()); + resolvedLabel = _ctx.appRes("UIUserToolBarDashboard.page." + resolvedLabel); } boolean toolong = (resolvedLabel.length() > 60);