Author: ndkhoiits
Date: 2011-08-13 23:46:19 -0400 (Sat, 13 Aug 2011)
New Revision: 7087
Modified:
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/BasePartialUpdateToolbar.java
Log:
GTNPORTAL-2006 Should not allow to click to a node if it doesn't point to a page
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-08-14
03:41:06 UTC (rev 7086)
+++
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/toolbar/webui/component/BasePartialUpdateToolbar.java 2011-08-14
03:46:19 UTC (rev 7087)
@@ -170,9 +170,13 @@
ResourceURL rsURL = res.createResourceURL();
rsURL.setResourceID(res.encodeURL(getResourceIdFromNode(node, navId)));
- json.put("getNodeURL", rsURL.toString());
- json.put("actionLink", Util.getPortalRequestContext().getPortalURI() +
node.getURI());
+ json.put("getNodeURL", rsURL.toString());
+ if (node.getPageRef() != null)
+ {
+ json.put("actionLink", Util.getPortalRequestContext().getPortalURI() +
node.getURI());
+ }
+
JSONArray childs = new JSONArray();
for (UserNode child : node.getChildren())
{
Show replies by date