[jboss-svn-commits] JBL Code SVN: r12892 - labs/jbossforums/branches/forums101P26/forums/src/main/org/jboss/portlet/forums/ui.

[jboss-svn-commits at lists.jboss.org]

Author: szimano
Date: 2007-06-27 07:37:17 -0400 (Wed, 27 Jun 2007)
New Revision: 12892

Modified:
   labs/jbossforums/branches/forums101P26/forums/src/main/org/jboss/portlet/forums/ui/PortalUtil.java
Log:
don't show id when on global feed link

Modified: labs/jbossforums/branches/forums101P26/forums/src/main/org/jboss/portlet/forums/ui/PortalUtil.java
===================================================================
--- labs/jbossforums/branches/forums101P26/forums/src/main/org/jboss/portlet/forums/ui/PortalUtil.java	2007-06-27 11:33:14 UTC (rev 12891)
+++ labs/jbossforums/branches/forums101P26/forums/src/main/org/jboss/portlet/forums/ui/PortalUtil.java	2007-06-27 11:37:17 UTC (rev 12892)
@@ -51,6 +51,8 @@
 import org.jboss.portal.identity.UserModule;
 import org.jboss.portal.identity.UserProfileModule;
 import org.jboss.portlet.forums.ForumsConstants;
+import org.jboss.portlet.forums.feeds.FeedConstants;
+import org.jboss.portlet.forums.feeds.FeedsServlet;
 import org.jboss.portlet.forums.helper.TempFileBinding;
 import org.jboss.portlet.forums.impl.MessageImpl;
 import org.jboss.portlet.forums.impl.PollImpl;
@@ -265,8 +267,13 @@
 		if (rreq instanceof RenderRequest) {
 			RenderRequest req = (RenderRequest) rreq;
 
-			return req.getContextPath() + "/feeds/" + type + "/" + what + "/"
-					+ id.toString();
+			return req.getContextPath()
+					+ "/feeds/"
+					+ type
+					+ "/"
+					+ what
+					+ (FeedConstants.GLOBAL.equals(what) ? "" : "/"
+							+ id.toString());
 		}
 
 		return null;