[portal-commits] JBoss Portal SVN: r7885 - in branches/JBoss_Portal_Branch_2_6/core/src: resources/portal-core-war/WEB-INF/jsp/user and 1 other directory.

Author: thomas.heute(a)jboss.com Date: 2007-08-09 10:44:54 -0400 (Thu, 09 Aug 2007) New Revision: 7885 Added: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/viewProfile.jsp Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/ui/portlet/user/UserPortlet.java Log: - Add "view profile" operation Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/ui/portlet/user/UserPortlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/ui/portlet/user/UserPortlet.java 2007-08-09 13:15:49 UTC (rev 7884) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/ui/portlet/user/UserPortlet.java 2007-08-09 14:44:54 UTC (rev 7885) @@ -114,6 +114,9 @@ /** Render operation to show the user profile to edit. */ public static final String OP_SHOWPROFILE = "showProfile"; + /** Render operation to show a user profile. */ + public static final String OP_VIEWPROFILE = "viewProfile"; + /** Render operation to show the screen to assign roles to a user. */ public static final String OP_SHOWADDROLESTOUSER = "showAddRolesToUser"; @@ -230,6 +233,7 @@ return; } */ + if (req.getRemoteUser() != null) { if (req.getWindowState() != WindowState.MAXIMIZED) @@ -350,6 +354,53 @@ PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/user/editProfile.jsp"); rd.include(req, resp); } + else if (OP_VIEWPROFILE.equals(op)) + { + String userid = req.getParameters().getParameter("userid"); + User user = null; + if (userid != null) + { + try + { + user = userModule.findUserById(userid); + } + catch (Exception e) + { + log.error("Cannot retrieve user", e); + } + } + else + { + user = req.getUser(); + try + { + user = userModule.findUserById(user.getId()); + } + catch (IdentityException e) + { + log.error("Cannot retrieve user", e); + } + } + + // Validate we have a user object + if (user == null) + { + throw new PortletException("Not user object found"); + } + + // + DelegateContext ctx = new DelegateContext(); + + // + ctx.put("username", user.getUserName()); + fillContextWithUserProfile(user, ctx); + + + req.setAttribute(PortalJsp.CTX_REQUEST, ctx); + resp.setTitle(bundle.getString("REGISTER_PERSONALINFO")); + PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/user/viewProfile.jsp"); + rd.include(req, resp); + } else if (OP_SHOWMENU.equals(op)) { DelegateContext ctx = new DelegateContext(); @@ -598,6 +649,52 @@ PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/user/register.jsp"); rd.include(req, resp); } + else if (OP_VIEWPROFILE.equals(op)) + { + String userid = req.getParameters().getParameter("userid"); + User user = null; + if (userid != null) + { + try + { + user = userModule.findUserById(userid); + } + catch (Exception e) + { + log.error("Cannot retrieve user", e); + } + } + else + { + user = req.getUser(); + try + { + user = userModule.findUserById(user.getId()); + } + catch (IdentityException e) + { + log.error("Cannot retrieve user", e); + } + } + + // Validate we have a user object + if (user == null) + { + throw new PortletException("Not user object found"); + } + + // + DelegateContext ctx = new DelegateContext(); + + // + ctx.put("username", user.getUserName()); + fillContextWithUserProfile(user, ctx); + + + req.setAttribute(PortalJsp.CTX_REQUEST, ctx); + PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/user/viewProfile.jsp"); + rd.include(req, resp); + } else if (OP_SHOWREGISTER_TY.equals(op)) { PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/user/register_ty.jsp"); Added: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/viewProfile.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/viewProfile.jsp (rev 0) +++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/viewProfile.jsp 2007-08-09 14:44:54 UTC (rev 7885) @@ -0,0 +1,37 @@ +<%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %> +<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %> +<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %> +<%@ page isELIgnored="false" %> + +<table cellpadding="0" cellspacing="8" border="0" class="pn-normal"> + +<tr> + <td class="portlet-form-label">${n:i18n("LIST_USERNAME")}</td> + <td>${n:out("username")}</td> +</tr> +<tr> + <td class="portlet-form-label">${n:i18n("REGISTER_GIVENNAME")}</td> + <td>${n:out("GIVENNAME")}</td> +</tr> +<tr> + <td class="portlet-form-label">${n:i18n("REGISTER_FAMILYNAME")}</td> + <td>${n:out("FAMILYNAME")}</td> +</tr> +<tr> + <td class="portlet-form-label">${n:i18n("REGISTER_FAKEEMAIL")}</td> + <td>${n:out("FAKEEMAIL")}</td> +</tr> +<tr> + <td class="portlet-form-label">${n:i18n("REGISTER_HOMEPAGE")}</td> + <td>${n:out("HOMEPAGE")}</td> +</tr> +<tr> + <td class="portlet-form-label">${n:i18n("REGISTER_LOCATION")}</td> + <td>${n:out("LOCATION")}</td> +</tr> +</table> + +<form + name="<portlet:namespace/>cancel" + action="<portlet:renderURL windowState="normal"><portlet:param name="op" value="showMenu"/></portlet:renderURL>" + method="post"/> Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/viewProfile.jsp ___________________________________________________________________ Name: svn:executable + *