[jboss-svn-commits] JBoss Portal SVN: r5183 - in branches/JBoss_Portal_Branch_2_4/core/src: main/org/jboss/portal/core/portlet/user resources/portal-core-war/WEB-INF/classes resources/portal-core-war/WEB-INF/jsp/user
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Sep 12 13:40:27 EDT 2006
Author: roy.russo at jboss.com
Date: 2006-09-12 13:40:25 -0400 (Tue, 12 Sep 2006)
New Revision: 5183
Modified:
branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/user/UserPortlet.java
branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties
branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/classes/Resource_en.properties
branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/classes/Resource_es.properties
branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/classes/Resource_fr.properties
branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/jsp/user/listUsers.jsp
branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/jsp/user/menu.jsp
Log:
JBPORTAL-1029 - Ability for an administrator to add/remove users
Modified: branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/user/UserPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/user/UserPortlet.java 2006-09-12 17:34:50 UTC (rev 5182)
+++ branches/JBoss_Portal_Branch_2_4/core/src/main/org/jboss/portal/core/portlet/user/UserPortlet.java 2006-09-12 17:40:25 UTC (rev 5183)
@@ -22,6 +22,8 @@
package org.jboss.portal.core.portlet.user;
import org.jboss.logging.Logger;
+import org.jboss.portal.api.node.PortalNode;
+import org.jboss.portal.api.node.PortalNodeURL;
import org.jboss.portal.common.context.DelegateContext;
import org.jboss.portal.common.util.LocaleInfo;
import org.jboss.portal.common.util.Tools;
@@ -38,13 +40,11 @@
import org.jboss.portal.theme.PortalTheme;
import org.jboss.portal.theme.ThemeInfo;
import org.jboss.portal.theme.ThemeService;
-import org.jboss.portal.api.node.PortalNodeURL;
import org.jboss.portlet.JBossActionRequest;
import org.jboss.portlet.JBossActionResponse;
import org.jboss.portlet.JBossPortlet;
import org.jboss.portlet.JBossRenderRequest;
import org.jboss.portlet.JBossRenderResponse;
-import org.jboss.portal.api.node.PortalNode;
import javax.portlet.PortletException;
import javax.portlet.PortletRequestDispatcher;
@@ -65,36 +65,58 @@
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
* @author <a href="mailto:theute at jboss.org">Thomas Heute </a>
* @author <a href="mailto:mageshbk at jboss.com">Magesh Kumar Bojan</a>
+ * @author <a href="mailto:roy at jboss.org">Roy Russo</a>
* @version $Revision$
*/
public class UserPortlet
extends JBossPortlet
{
- /** The class logger. */
+ /**
+ * The class logger.
+ */
public static final Logger log = Logger.getLogger(JBossPortlet.class);
- /** Render operation to show the login screen. */
+ /**
+ * Render operation to show the login screen.
+ */
public static final String OP_SHOWLOGIN = "showLogin";
- /** Render operation to show the register screen. */
+ /**
+ * Render operation to show the register screen.
+ */
public static final String OP_SHOWREGISTER = "showRegister";
- /** Render operation to show the user menu screen. */
+ /**
+ * Render operation to show the user menu screen.
+ */
public static final String OP_SHOWMENU = "showMenu";
- /** Render operation to show the user profile to edit. */
+ /**
+ * Render operation to show the user profile to edit.
+ */
public static final String OP_SHOWPROFILE = "showProfile";
- /** Render operation to show the screen to assign roles to a user. */
+ /**
+ * Render operation to show the screen to assign roles to a user.
+ */
public static final String OP_SHOWADDROLESTOUSER = "showAddRolesToUser";
- /** Render operation to show the list of users. */
+ /**
+ * Render operation to show the list of users.
+ */
public static final String OP_SHOWLISTUSERS = "showListUsers";
- /** Logout the user. */
+ /**
+ * Logout the user.
+ */
public static final String OP_USERLOGOUT = "userLogout";
+ /**
+ * Deletes the user
+ */
+ public static final String OP_DELETEUSER = "deleteUser";
+
private UserModule userModule;
private RoleModule roleModule;
private MailModule mailModule;
@@ -266,18 +288,18 @@
localeCtx.put("selected", "selected");
}
}
-
+
//
- String selectedTheme = (String)user.getProperties().get(User.INFO_USER_THEME);
- ThemeService themeService = (ThemeService)getPortletContext().getAttribute("ThemeService");
- for (Iterator i = themeService.getThemes().iterator(); i.hasNext();)
+ String selectedTheme = (String) user.getProperties().get(User.INFO_USER_THEME);
+ ThemeService themeService = (ThemeService) getPortletContext().getAttribute("ThemeService");
+ for(Iterator i = themeService.getThemes().iterator(); i.hasNext();)
{
- PortalTheme theme = (PortalTheme)i.next();
+ PortalTheme theme = (PortalTheme) i.next();
ThemeInfo info = theme.getThemeInfo();
DelegateContext themeCtx = ctx.next("theme");
themeCtx.put("name", info.getAppId() + "." + info.getName());
- themeCtx.put("id", info.getRegistrationId().toString());
- if ((selectedTheme != null) && selectedTheme.equals(info.getRegistrationId().toString()))
+ themeCtx.put("id", info.getRegistrationId().toString());
+ if((selectedTheme != null) && selectedTheme.equals(info.getRegistrationId().toString()))
{
themeCtx.put("selected", "selected");
}
@@ -357,8 +379,13 @@
rolesURL.setParameter(getOperationName(), OP_SHOWADDROLESTOUSER);
rolesURL.setParameter("userid", "" + user.getId());
+ PortletURL deleteUrl = resp.createActionURL();
+ deleteUrl.setParameter(getOperationName(), OP_DELETEUSER);
+ deleteUrl.setParameter("userid", "" + user.getId());
+
rowCtx.put("editURL" + oddeven, editURL.toString());
rowCtx.put("rolesURL" + oddeven, rolesURL.toString());
+ rowCtx.put("deleteURL" + oddeven, deleteUrl.toString());
}
if(offset != 0)
@@ -455,11 +482,20 @@
rd.include(req, resp);
}
}
+ else if(OP_SHOWREGISTER.equals(op))
+ {
+ if(req.isUserInRole("Admin"))
+ {
+ PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/user/registerUser.jsp");
+ rd.include(req, resp);
+ }
+ }
else
{
log.error("This operation does not exist when user is logged in:" + op);
}
}
+
else
{
// User is not logged in
@@ -477,6 +513,7 @@
PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/user/register.jsp");
rd.include(req, resp);
}
+
else if(OP_SHOWLOGIN.equals(op))
{
PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/user/login.jsp");
@@ -1036,6 +1073,23 @@
}
}
+ public void deleteUser(JBossActionRequest request, JBossActionResponse response)
+ {
+ if(request.isUserInRole("Admin"))
+ {
+ try
+ {
+ User user = userModule.findUserById(request.getParameter("userid"));
+ userModule.removeUser(user.getId());
+ }
+ catch(IdentityException e)
+ {
+ e.printStackTrace();
+ }
+ }
+ portletHelper.setRenderParameter(response, getOperationName(), OP_SHOWLISTUSERS);
+ }
+
/*
* private String getTimezoneOffsetString(short timezoneOffset) {
* StringBuffer timeZone = new StringBuffer(); for (int i = 0; i <
Modified: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties 2006-09-12 17:34:50 UTC (rev 5182)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/classes/Resource.properties 2006-09-12 17:40:25 UTC (rev 5183)
@@ -254,6 +254,7 @@
// Registration
REGISTER_REGISTER=Don't have an account yet? You can
REGISTER_REGISTER_LINK=create one
+REGISTER_REGISTER_ADMIN_LINK=Create new account
REGISTER_NEWUSER=New user registration
REGISTER_PASSWORDAGAIN=Confirm your password
REGISTER_REALEMAIL=Real e-mail
@@ -323,6 +324,7 @@
LIST_ACTIONSSHOWPROFILE=Profile
LIST_ACTIONADDROLESTOUSER=Roles
LIST_ACTIONEDITROLES=Edit Roles
+LIST_ACTIONDELETEUSER=Delete user
FILTER=Filter
NEXTPAGE=Next page
Modified: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/classes/Resource_en.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/classes/Resource_en.properties 2006-09-12 17:34:50 UTC (rev 5182)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/classes/Resource_en.properties 2006-09-12 17:40:25 UTC (rev 5183)
@@ -254,6 +254,7 @@
// Registration
REGISTER_REGISTER=Don't have an account yet? You can
REGISTER_REGISTER_LINK=create one
+REGISTER_REGISTER_ADMIN_LINK=Create new account
REGISTER_NEWUSER=New user registration
REGISTER_PASSWORDAGAIN=Confirm your password
REGISTER_REALEMAIL=Real e-mail
@@ -323,6 +324,7 @@
LIST_ACTIONSSHOWPROFILE=Profile
LIST_ACTIONADDROLESTOUSER=Roles
LIST_ACTIONEDITROLES=Edit Roles
+LIST_ACTIONDELETEUSER=Delete user
FILTER=Filter
NEXTPAGE=Next page
Modified: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/classes/Resource_es.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/classes/Resource_es.properties 2006-09-12 17:34:50 UTC (rev 5182)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/classes/Resource_es.properties 2006-09-12 17:40:25 UTC (rev 5183)
@@ -254,6 +254,7 @@
// Registration
REGISTER_REGISTER=¿No tiene una cuenta todavía? Puede
REGISTER_REGISTER_LINK=crear una
+REGISTER_REGISTER_ADMIN_LINK=Crear una cuenta
REGISTER_NEWUSER=Registro de nuevo usuario
REGISTER_PASSWORDAGAIN=Confirme su clave
REGISTER_REALEMAIL=E-mail real
@@ -323,6 +324,7 @@
LIST_ACTIONSSHOWPROFILE=Perfil
LIST_ACTIONADDROLESTOUSER=Roles
LIST_ACTIONEDITROLES=Editar Roles
+LIST_ACTIONDELETEUSER=Borrar el usario
FILTER=Filtro
NEXTPAGE=Página siguiente
Modified: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/classes/Resource_fr.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/classes/Resource_fr.properties 2006-09-12 17:34:50 UTC (rev 5182)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/classes/Resource_fr.properties 2006-09-12 17:40:25 UTC (rev 5183)
@@ -230,6 +230,7 @@
// Registration
REGISTER_REGISTER=Pas encore membre ?
REGISTER_REGISTER_LINK=Créer un compte
+REGISTER_REGISTER_ADMIN_LINK=Créer un compte
REGISTER_NEWUSER=Enregistrement d'un nouvel utilisateur
REGISTER_PASSWORDAGAIN=Comfirmer votre mot de passe
REGISTER_REALEMAIL=e-mail réel
@@ -297,6 +298,7 @@
LIST_ACTIONS=Actions
LIST_ACTIONSSHOWPROFILE=Profil
LIST_ACTIONADDROLESTOUSER=Roles
+LIST_ACTIONDELETEUSER=Delete user
FILTER=Filtre
NEXTPAGE=Page suivante
Modified: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/jsp/user/listUsers.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/jsp/user/listUsers.jsp 2006-09-12 17:34:50 UTC (rev 5182)
+++ branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/jsp/user/listUsers.jsp 2006-09-12 17:40:25 UTC (rev 5183)
@@ -1,57 +1,63 @@
<%@ 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" %>
-<span class="portlet-font"><a href="<portlet:renderURL windowState="normal"><portlet:param name="op" value="showMenu"/></portlet:renderURL>">${n:i18n("REGISTER_SHOWMENU")}</a></span>
+<%@ page isELIgnored="false" %>
+<span class="portlet-font"><a
+ href="<portlet:renderURL windowState="normal"><portlet:param name="op" value="showMenu"/></portlet:renderURL>">${n:i18n("REGISTER_SHOWMENU")}</a></span>
<form action="<portlet:actionURL><portlet:param name="op" value="showListUsers"/></portlet:actionURL>" method="post">
-<table>
-<tr class="portlet-section-header">
- <th colspan="2">${n:i18n("LIST_FILTERS")}</th>
-</tr>
-<tr class="portlet-section-body">
- <td>${n:i18n("LIST_USERSPERPAGE")}
- <select name="usersperpage">
- <option value="10">10</option>
- <option value="20">20</option>
- <option value="30">30</option>
- <option value="50">50</option>
- <option value="75">75</option>
- <option value="100">100</option>
- </select>
- </td>
- <td>${n:i18n("LIST_USERNAMECONTAINS")}
- <input type="text" name="usernamefilter" value="${n:out("usernamefilter")}" size="15" />
- </td>
- <td>
- <input type="submit" value="${n:i18n("FILTER")}"/>
- </td>
-</tr>
-</table>
+ <table>
+ <tr class="portlet-section-header">
+ <th colspan="2">${n:i18n("LIST_FILTERS")}</th>
+ </tr>
+ <tr class="portlet-section-body">
+ <td>${n:i18n("LIST_USERSPERPAGE")}
+ <select name="usersperpage">
+ <option value="10">10</option>
+ <option value="20">20</option>
+ <option value="30">30</option>
+ <option value="50">50</option>
+ <option value="75">75</option>
+ <option value="100">100</option>
+ </select>
+ </td>
+ <td>${n:i18n("LIST_USERNAMECONTAINS")}
+ <input type="text" name="usernamefilter" value="${n:out("usernamefilter")}" size="15"/>
+ </td>
+ <td>
+ <input type="submit" value="${n:i18n("FILTER")}"/>
+ </td>
+ </tr>
+ </table>
</form>
<n:if ctx="previouspage"><a href="${n:out("previouspage.link")}">${n:i18n("PREVIOUSPAGE")}</a></n:if>
<n:if ctx="nextpage"><a href="${n:out("nextpage.link")}">${n:i18n("NEXTPAGE")}</a></n:if>
<table>
- <tr class="portlet-section-header">
- <th>${n:i18n("LIST_FULLNAME")}</th>
- <th>${n:i18n("LIST_USERNAME")}</th>
- <th>${n:i18n("LIST_ROLES")}</th>
- <th>${n:i18n("LIST_ACTIONS")}</th>
- </tr>
- <n:iterate ctx="row">
- <tr class="portlet-section-body">
- <td>${n:out("row.fullname0")}</td>
- <td>${n:out("row.username0")}</td>
- <td><n:iterate ctx="roles0">${n:out("row.roles0.name")}<br /></n:iterate></td>
- <td><a href="${n:out("row.editURL0")}">${n:i18n("LIST_ACTIONSSHOWPROFILE")}</a> <a href="${n:out("row.rolesURL0")}">${n:i18n("LIST_ACTIONADDROLESTOUSER")}</a></td>
- </tr>
- <tr class="portlet-section-alternate">
- <td>${n:out("row.fullname1")}</td>
- <td>${n:out("row.username1")}</td>
- <td><n:iterate ctx="roles1">${n:out("row.roles1.name")}<br /></n:iterate></td>
- <td><a href="${n:out("row.editURL1")}">${n:i18n("LIST_ACTIONSSHOWPROFILE")}</a> <a href="${n:out("row.rolesURL1")}">${n:i18n("LIST_ACTIONADDROLESTOUSER")}</a></td>
- </tr>
- </n:iterate>
+ <tr class="portlet-section-header">
+ <th>${n:i18n("LIST_FULLNAME")}</th>
+ <th>${n:i18n("LIST_USERNAME")}</th>
+ <th>${n:i18n("LIST_ROLES")}</th>
+ <th>${n:i18n("LIST_ACTIONS")}</th>
+ </tr>
+ <n:iterate ctx="row">
+ <tr class="portlet-section-body">
+ <td>${n:out("row.fullname0")}</td>
+ <td>${n:out("row.username0")}</td>
+ <td><n:iterate ctx="roles0">${n:out("row.roles0.name")}<br/></n:iterate></td>
+ <td><a href="${n:out("row.editURL0")}">${n:i18n("LIST_ACTIONSSHOWPROFILE")}</a> <a
+ href="${n:out("row.rolesURL0")}">${n:i18n("LIST_ACTIONADDROLESTOUSER")}</a> <a
+ href="${n:out("row.deleteURL0")}">${n:i18n("LIST_ACTIONDELETEUSER")}</a>
+ </td>
+ </tr>
+ <tr class="portlet-section-alternate">
+ <td>${n:out("row.fullname1")}</td>
+ <td>${n:out("row.username1")}</td>
+ <td><n:iterate ctx="roles1">${n:out("row.roles1.name")}<br/></n:iterate></td>
+ <td><a href="${n:out("row.editURL1")}">${n:i18n("LIST_ACTIONSSHOWPROFILE")}</a> <a
+ href="${n:out("row.rolesURL1")}">${n:i18n("LIST_ACTIONADDROLESTOUSER")}</a> <a
+ href="${n:out("row.deleteURL1")}">${n:i18n("LIST_ACTIONDELETEUSER")}</a></td>
+ </tr>
+ </n:iterate>
</table>
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_4/core/src/resources/portal-core-war/WEB-INF/jsp/user/menu.jsp
===================================================================
(Binary files differ)
More information about the jboss-svn-commits
mailing list