[Jboss-svn-commits] JBL Code SVN: r4434 - labs/jbosslabs/trunk/portal-extensions/forge-freezone/src/java/org/jboss/forge/projects/freezone

[<jbo...@li...>]

Author: szimano
Date: 2006-05-26 09:42:15 -0400 (Fri, 26 May 2006)
New Revision: 4434

Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java
Log:
freezone JBLAB-674


Modified: labs/jbosslabs/trunk/portal-extensions/forge-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java	2006-05-26 13:06:28 UTC (rev 4433)
+++ labs/jbosslabs/trunk/portal-extensions/forge-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java	2006-05-26 13:42:15 UTC (rev 4434)
@@ -114,7 +114,7 @@
 			// (possibly) create a new page.ru
 			if (isAllowedToEdit(portalName, request, response)) {
 				response.setContentType(Constants.PAGES_MIME_TYPE);
-				writeTagmeButton(request, response);
+				writeTagmeButton(request, response, requestedPath);
 				writeEditLink(portalName, requestedPath, request, response);
 				response.getWriter().println(ERROR_404_MSG);
 			} else {
@@ -125,7 +125,7 @@
 		}
 
 		response.setContentType(Constants.PAGES_MIME_TYPE);
-		writeTagmeButton(request, response);
+		writeTagmeButton(request, response, requestedPath);
 		if (isAllowedToEdit(portalName, request, response)) {
 			writeEditLink(portalName, requestedPath, request, response);
 			Tools.transfer(requestedNode.getContentInputStream(), response
@@ -137,11 +137,17 @@
 	}
 
 	private void writeTagmeButton(JBossRenderRequest request,
-			JBossRenderResponse response) throws PortletException, IOException {
-		PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher(
-				"/WEB-INF/jsp/normal.jsp");
+			JBossRenderResponse response, String requestedPath)
+			throws PortletException, IOException {
+		if (request.getUser() != null) {
+			request.setAttribute("TAGME_PATH", requestedPath);
+			request.setAttribute("TAGME_USER", request.getUser().getUserName());
+			
+			PortletRequestDispatcher rd = getPortletContext()
+					.getRequestDispatcher("/WEB-INF/jsp/normal.jsp");
 
-		rd.include(request, response);
+			rd.include(request, response);
+		}
 	}
 
 	@SuppressWarnings("unchecked")