[jboss-svn-commits] JBoss Portal SVN: r5423 - in trunk/core/src: main/org/jboss/portal/core/portlet/role resources/portal-core-war/WEB-INF/jsp/role resources/portal-core-war/WEB-INF/jsp/user
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Oct 11 15:28:04 EDT 2006
Author: roy.russo at jboss.com
Date: 2006-10-11 15:27:56 -0400 (Wed, 11 Oct 2006)
New Revision: 5423
Modified:
trunk/core/src/main/org/jboss/portal/core/portlet/role/RolePortlet.java
trunk/core/src/resources/portal-core-war/WEB-INF/jsp/role/editRole.jsp
trunk/core/src/resources/portal-core-war/WEB-INF/jsp/role/editUserRoles.jsp
trunk/core/src/resources/portal-core-war/WEB-INF/jsp/role/menu.jsp
trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/editUserRoles.jsp
Log:
JBPORTAL-1074 - ui/functionality enhancements to roleportlet.
Modified: trunk/core/src/main/org/jboss/portal/core/portlet/role/RolePortlet.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/portlet/role/RolePortlet.java 2006-10-11 17:45:52 UTC (rev 5422)
+++ trunk/core/src/main/org/jboss/portal/core/portlet/role/RolePortlet.java 2006-10-11 19:27:56 UTC (rev 5423)
@@ -200,6 +200,8 @@
{
Set roles = roleModule.findRoles();
DelegateContext ctx = new DelegateContext();
+ ctx.put("editroleid", req.getParameter("roleid"));
+ ctx.put("editroledisplayname", req.getParameter("roledisplayname"));
Iterator i = roles.iterator();
DelegateContext roleCtx = null;
while (i.hasNext())
@@ -459,16 +461,20 @@
try
{
roleModule.createRole(roleName, roleDisplayName);
+/*
try
{
- resp.setRenderParameter(getOperationName(),
- getDefaultOperation());
+*/
+ resp.setRenderParameter(getOperationName(),
+ getDefaultOperation());
+/*
resp.setWindowState(WindowState.NORMAL);
}
catch (WindowStateException e1)
{
log.error("Couldn't put the window in normal state");
}
+*/
}
catch (IllegalArgumentException e)
{
@@ -492,9 +498,8 @@
roleDisplayName);
resp.setRenderParameter("roledisplayname_error",
"ROLE_ERROR_DISPLAYNAMEALREADYEXISTS");
- resp
- .setRenderParameter(getOperationName(),
- OP_SHOWCREATEROLE);
+ resp.setRenderParameter(getOperationName(),
+ getDefaultOperation());
}
else if (!roleByNameAvailable(roleName))
{
@@ -504,9 +509,8 @@
roleDisplayName);
resp.setRenderParameter("rolename_error",
"ROLE_ERROR_NAMEALREADYEXISTS");
- resp
- .setRenderParameter(getOperationName(),
- OP_SHOWCREATEROLE);
+ resp.setRenderParameter(getOperationName(),
+ getDefaultOperation());
}
}
}
@@ -527,7 +531,8 @@
resp.setRenderParameter("roledisplayname_error",
"ROLE_ERROR_DISPLAYNAMEEMPTY");
}
- resp.setRenderParameter(getOperationName(), OP_SHOWCREATEROLE);
+ resp.setRenderParameter(getOperationName(),
+ getDefaultOperation());
}
}
}
@@ -549,18 +554,30 @@
{
role = roleModule.findRoleById(roleID);
// Check that the new display name is available
- if (roleByDisplayNameAvailable(newDisplayName))
+ if (!"".equals(newDisplayName))
{
- role.setDisplayName(newDisplayName);
+ if (roleByDisplayNameAvailable(newDisplayName))
+ {
+ role.setDisplayName(newDisplayName);
+ }
+ else
+ // The display name is not available, go back to the prefilled form
+ {
+ portletHelper.setRenderParameter(resp, "roledisplayname",
+ newDisplayName);
+ portletHelper.setRenderParameter(resp, "roleid", roleID);
+ resp.setRenderParameter("roledisplayname_error",
+ "ROLE_ERROR_DISPLAYNAMEALREADYEXISTS");
+ resp.setRenderParameter(getOperationName(), OP_SHOWEDITROLE);
+ }
}
else
- // The display name is not available, go back to the prefilled form
{
portletHelper.setRenderParameter(resp, "roledisplayname",
newDisplayName);
portletHelper.setRenderParameter(resp, "roleid", roleID);
resp.setRenderParameter("roledisplayname_error",
- "ROLE_ERROR_DISPLAYNAMEALREADYEXISTS");
+ "ROLE_ERROR_NAMEEMPTY");
resp.setRenderParameter(getOperationName(), OP_SHOWEDITROLE);
}
}
@@ -574,7 +591,6 @@
log.error("Cannot update role, unexpected error");
e.printStackTrace();
}
- resp.setWindowState(WindowState.MAXIMIZED);
}
}
Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/role/editRole.jsp
===================================================================
(Binary files differ)
Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/role/editUserRoles.jsp
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/jsp/role/editUserRoles.jsp 2006-10-11 17:45:52 UTC (rev 5422)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/jsp/role/editUserRoles.jsp 2006-10-11 19:27:56 UTC (rev 5423)
@@ -1,31 +1,30 @@
<%@ 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" %>
+<%@ page isELIgnored="false" %>
+<span>${n:i18n("EDITROLESFORUSER")}: "${n:out("username")}"
-<div align="center">
-
-<font class="portlet-font">${n:i18n("EDITROLESFORUSER")}: ${n:out("userfullname")} "${n:out("username")}"
-</font>
-
<form method="post" action="<portlet:actionURL><portlet:param name="op" value="addRolesToUser"/></portlet:actionURL>">
-<input type="hidden" name="userid" value="${n:out("userid")}"/>
-<table>
- <tr>
- <th colspan="3" class="portlet-section-header">${n:i18n("ROLESAVAILABLE")}</th>
- </tr>
- <n:iterate ctx="row">
- <tr>
- <n:iterate ctx="col">
- <td><input type="checkbox" name="roles" value="${n:out("row.col.name")}" ${n:out("row.col.ischecked")}><font class="portlet-font">${n:out("row.col.displayname")}</font></td>
- </n:iterate>
- </tr>
- </n:iterate>
- <tr>
- <td colspan="3"><input type="submit" value="${n:i18n("ASSIGNROLES")}" class="portlet-form-input-field"/></th>
- </tr>
-</table>
-</form>
-
-</div>
+ <input type="hidden" name="userid" value="${n:out("userid")}"/>
+ <table>
+ <tr>
+ <th colspan="3">${n:i18n("ROLESAVAILABLE")}</th>
+ </tr>
+ <n:iterate ctx="row">
+ <tr>
+ <n:iterate ctx="col">
+ <td><input type="checkbox" name="roles"
+ value="${n:out("row.col.name")}" ${n:out("row.col.ischecked")}>${n:out("row.col.displayname")}
+ </td>
+ </n:iterate>
+ </tr>
+ </n:iterate>
+ <tr>
+ <td colspan="3"><input type="submit" class="portlet-form-button"
+ value="${n:i18n("ASSIGNROLES")}"/>
+ <span class="portlet-font"><a
+ href="<portlet:renderURL windowState="normal"><portlet:param name="op" value="showSummary"/></portlet:renderURL>">${n:i18n("Cancel")}</a></span>
+ </tr>
+ </table>
+</form>
\ No newline at end of file
Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/role/menu.jsp
===================================================================
(Binary files differ)
Modified: trunk/core/src/resources/portal-core-war/WEB-INF/jsp/user/editUserRoles.jsp
===================================================================
(Binary files differ)
More information about the jboss-svn-commits
mailing list