Author: phuong_vu Date: 2011-09-01 04:16:51 -0400 (Thu, 01 Sep 2011) New Revision: 7271 Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/BasePartialUpdateToolbar.java portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl 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 portal/trunk/portlet/web/src/main/java/org/exoplatform/portal/webui/component/UINavigationPortlet.java portal/trunk/portlet/web/src/main/webapp/groovy/portal/webui/component/UIPortalNavigation.gtmpl Log: GTNPORTAL-2076 Portal navigation doesn't show some nodes in the first time access to portal Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/BasePartialUpdateToolbar.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/BasePartialUpdateToolbar.java 2011-09-01 04:34:29 UTC (rev 7270) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/BasePartialUpdateToolbar.java 2011-09-01 08:16:51 UTC (rev 7271) @@ -171,7 +171,7 @@ json.put("icon", node.getIcon()); ResourceURL rsURL = res.createResourceURL(); - rsURL.setResourceID(res.encodeURL(getResourceIdFromNode(node, navId))); + rsURL.setResourceID(getResourceIdFromNode(node, navId)); json.put("getNodeURL", rsURL.toString()); if (node.getPageRef() != null) 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-09-01 04:34:29 UTC (rev 7270) +++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarDashboardPortlet.gtmpl 2011-09-01 08:16:51 UTC (rev 7271) @@ -62,7 +62,7 @@ if (hasChild) { MimeResponse res = _ctx.getRequestContext().getResponse(); ResourceURL resourceURL = res.createResourceURL(); - resourceURL.setResourceID(res.encodeURL(node.getURI())); + resourceURL.setResourceID(node.getURI()); getNodeURL = "exo:getNodeURL='" + resourceURL.toString() + "'"; } 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-09-01 04:34:29 UTC (rev 7270) +++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarGroupPortlet.gtmpl 2011-09-01 08:16:51 UTC (rev 7271) @@ -65,7 +65,7 @@ def groupId = node.getNavigation().getKey().getName(); MimeResponse res = _ctx.getRequestContext().getResponse(); ResourceURL resourceURL = res.createResourceURL(); - resourceURL.setResourceID(res.encodeURL(groupId + "::" + node.getURI())); + resourceURL.setResourceID(groupId + "::" + node.getURI()); getNodeURL = "exo:getNodeURL='" + resourceURL.toString() + "'"; } 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-09-01 04:34:29 UTC (rev 7270) +++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/admintoolbar/webui/component/UIUserToolBarSitePortlet.gtmpl 2011-09-01 08:16:51 UTC (rev 7271) @@ -102,7 +102,7 @@ if (hasChild) { MimeResponse res = _ctx.getRequestContext().getResponse(); ResourceURL resourceURL = res.createResourceURL(); - resourceURL.setResourceID(res.encodeURL(node.getURI())); + resourceURL.setResourceID(node.getURI()); getNodeURL = "exo:getNodeURL='" + resourceURL.toString() + "'"; } Modified: portal/trunk/portlet/web/src/main/java/org/exoplatform/portal/webui/component/UINavigationPortlet.java =================================================================== --- portal/trunk/portlet/web/src/main/java/org/exoplatform/portal/webui/component/UINavigationPortlet.java 2011-09-01 04:34:29 UTC (rev 7270) +++ portal/trunk/portlet/web/src/main/java/org/exoplatform/portal/webui/component/UINavigationPortlet.java 2011-09-01 08:16:51 UTC (rev 7271) @@ -142,7 +142,7 @@ json.put("icon", node.getIcon()); ResourceURL rsURL = res.createResourceURL(); - rsURL.setResourceID(res.encodeURL(node.getURI())); + rsURL.setResourceID(node.getURI()); json.put("getNodeURL", rsURL.toString()); if (node.getPageRef() != null) Modified: portal/trunk/portlet/web/src/main/webapp/groovy/portal/webui/component/UIPortalNavigation.gtmpl =================================================================== --- portal/trunk/portlet/web/src/main/webapp/groovy/portal/webui/component/UIPortalNavigation.gtmpl 2011-09-01 04:34:29 UTC (rev 7270) +++ portal/trunk/portlet/web/src/main/webapp/groovy/portal/webui/component/UIPortalNavigation.gtmpl 2011-09-01 08:16:51 UTC (rev 7271) @@ -64,7 +64,7 @@ arrowIcon = "ArrowIcon"; MimeResponse res = _ctx.getRequestContext().getResponse(); javax.portlet.ResourceURL resourceURL = res.createResourceURL(); - resourceURL.setResourceID(res.encodeURL(node.getURI())); + resourceURL.setResourceID(node.getURI()); getNodeURL = "exo:getNodeURL='" + resourceURL.toString() + "'"; } @@ -118,7 +118,7 @@ if (node.getChildrenCount() > 0) { javax.portlet.ResourceURL resourceURL = res.createResourceURL(); - resourceURL.setResourceID(res.encodeURL(node.getURI())); + resourceURL.setResourceID(node.getURI()); %> <div class="UITab" exo:getNodeURL="<%=resourceURL.toString() %>"> <% } else { %>