Author: chathura
Date: Thu Jan 17 02:25:08 2008
New Revision: 12399
Log:
Completing the friendly name editing AJAX work done by Chanaka.
Modified:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/utils/UserUtil.java
trunk/registry/modules/webapps/src/main/webapp/admin/ajax/user-friendly-name.jsp
trunk/registry/modules/webapps/src/main/webapp/admin/js/common.js
trunk/registry/modules/webapps/src/main/webapp/admin/user.jsp
Modified:
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/utils/UserUtil.java
==============================================================================
---
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/utils/UserUtil.java
(original)
+++
trunk/registry/modules/webapps/src/main/java/org/wso2/registry/web/utils/UserUtil.java
Thu Jan 17 02:25:08 2008
@@ -20,6 +20,7 @@
import org.wso2.registry.RegistryConstants;
import org.wso2.registry.Registry;
import org.wso2.registry.web.UIConstants;
+import org.wso2.registry.web.actions.UserDetailsAction;
import org.wso2.registry.secure.SecureRegistry;
import org.wso2.usermanager.Realm;
import org.wso2.usermanager.UserManagerException;
@@ -62,6 +63,7 @@
return false;
}
+
public static void updateFriendlyName(HttpServletRequest request,
HttpServletResponse response)
throws ServletException, IOException {
@@ -73,15 +75,19 @@
SecureRegistry secureRegistry = (SecureRegistry) registry;
Realm userRealm = secureRegistry.getUserRealm();
- Map currentProperties =
userRealm.getUserStoreAdmin().getUserProperties(userName);
- currentProperties.put("friendlyName", friendlyName);
- }
- catch (RegistryException e) {
+ Map userProperties =
userRealm.getUserStoreAdmin().getUserProperties(userName);
+ userProperties.put("friendlyName", friendlyName);
+ userRealm.getUserStoreAdmin().setUserProperties(userName,
userProperties);
+
+ UserDetailsAction userDetailsAction = new UserDetailsAction();
+ userDetailsAction.setUserName(userName);
+ userDetailsAction.execute(request);
+ request.getSession().setAttribute(UIConstants.USER_BEAN,
userDetailsAction);
+
+ } catch (Exception e) {
request.getSession().setAttribute(UIConstants.ERROR_MESSAGE,
e.getMessage());
- } catch (UserManagerException e) {
- e.printStackTrace(); //To change body of catch statement use File
| Settings | File Templates.
}
-
request.getRequestDispatcher(UIConstants.AJAX_USER_FRIENDLY_NAME_JSP).forward(request,response);
+
request.getRequestDispatcher(UIConstants.AJAX_USER_FRIENDLY_NAME_JSP).forward(request,response);
}
}
Modified:
trunk/registry/modules/webapps/src/main/webapp/admin/ajax/user-friendly-name.jsp
==============================================================================
---
trunk/registry/modules/webapps/src/main/webapp/admin/ajax/user-friendly-name.jsp
(original)
+++
trunk/registry/modules/webapps/src/main/webapp/admin/ajax/user-friendly-name.jsp
Thu Jan 17 02:25:08 2008
@@ -1,28 +1,33 @@
<%@ page import="org.wso2.registry.web.UIConstants" %>
<%@ page import="org.wso2.registry.web.actions.UserDetailsAction" %>
-<%--
- Created by IntelliJ IDEA.
- User: chanaka jayasena
- Date: Jan 17, 2008
- Time: 11:38:27 AM
- To change this template use File | Settings | File Templates.
---%>
+
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+
<%
UserDetailsAction userDetailsAction = (UserDetailsAction)
request.getSession().getAttribute(UIConstants.USER_BEAN);
-
- String errorMessage = (String)
request.getSession().getAttribute(UIConstants.ERROR_MESSAGE);
- if (errorMessage != null) {
- request.getSession().setAttribute(UIConstants.ERROR_MESSAGE, null);
- }
%>
- <th style="width:140px; height:25px;">Friendly name:</th>
- <td style="text-align:right;width:20px;" align="right">
- <a
onclick="showHideCommon('friendlyNameEdit');showHideCommon('friendlyNameView');"
title="Edit Friendly Name" href="#">
- <img id="mainIconExpanded" border="0" align="bottom"
src="/wso2registry/admin/images/icon-edit.gif"/>
- </a>
- </td>
- <td>
- <%=userDetailsAction.getFriendlyName()%>
- </td>
+<table cellpadding="0" cellspacing="0" border="0" class="simple-data-table"
style="width:400px;margin-bottom:10px;">
+ <tr id="friendlyNameView">
+ <th style="width:140px; height:25px;">Friendly name:</th>
+ <td style="text-align:right;width:20px;" align="right">
+ <a
onclick="showHideCommon('friendlyNameEdit');showHideCommon('friendlyNameView');"
title="Edit Friendly Name" href="#">
+ <img id="mainIconExpanded" border="0" align="bottom"
src="/wso2registry/admin/images/icon-edit.gif"/>
+ </a>
+ </td>
+ <td>
+ <%=userDetailsAction.getFriendlyName()%>
+ </td>
+ </tr>
+ <tr id="friendlyNameEdit" style="display:none;">
+ <th style="width:140px; height:25px;">Friendly name:</th>
+ <td style="text-align:right;width:20px;" align="right">
+ <a title="Save Friendly Name" href="#editButton"
onclick="showHideCommon('friendlyNameEdit');showHideCommon('friendlyNameView');saveFriendlyName('<%=userDetailsAction.getUserName()%>');">
+ <img border="0" align="bottom"
src="/wso2registry/admin/images/save-button.gif"/>
+ </a>
+ </td>
+ <td>
+ <input type="text" id="friendlyName"
value="<%=userDetailsAction.getFriendlyName()%>" />
+ </td>
+ </tr>
+</table>
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/js/common.js
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/js/common.js
(original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/js/common.js Thu Jan
17 02:25:08 2008
@@ -310,6 +310,12 @@
new Ajax.Updater('resourceProperties',
'/wso2registry/system/removeProperty', { method: 'post', parameters:
{resourcePath: resourcePath, propertyName: propertyName} });
}
+function saveFriendlyName(userName) {
+
+ var friendlyName = document.getElementById('friendlyName').value;
+ new Ajax.Updater('friendlyNameDiv',
'/wso2registry/system/saveFriendlyName', { method: 'post', parameters:
{userName: userName, friendlyName: friendlyName} });
+}
+
// media type map to store file_extension -> media type pairs.
// these media type data will be retrieved upon the first request and stored
in memory.
var mediaTypeMap = null;
@@ -471,9 +477,3 @@
urlHelpText.style.color="#000000";
}
}
-
-function saveFriendlyName(userName)
-{
- var friendlyName = document.getElementById('friendlyName').value;
- new Ajax.Updater('friendlyNameView',
'/wso2registry/system/saveFriendlyName', { method: 'post', parameters:
{userName: userName, friendlyName: friendlyName} });
-}
\ No newline at end of file
Modified: trunk/registry/modules/webapps/src/main/webapp/admin/user.jsp
==============================================================================
--- trunk/registry/modules/webapps/src/main/webapp/admin/user.jsp
(original)
+++ trunk/registry/modules/webapps/src/main/webapp/admin/user.jsp Thu Jan
17 02:25:08 2008
@@ -5,6 +5,7 @@
<html>
<head>
<script language="JavaScript" type="text/JavaScript"
src="/wso2registry/admin/js/common.js"></script>
+ <script language="JavaScript" type="text/JavaScript"
src="/wso2registry/admin/js/prototype.js"></script>
<link type="text/css" href="/wso2registry/admin/css/main.css"
rel="stylesheet" />
<title>WSO2 Registry</title>
</head>
@@ -25,139 +26,143 @@
<div class="content">
- <h1 class="headding-user-manage">People</h1>
- <div class="breadcrumb" style="margin-bottom:10px;"><a
href="/wso2registry/system/people">People</a> |
<%=userDetailsAction.getUserName()%> (Settings)</div>
+<h1 class="headding-user-manage">People</h1>
+<div class="breadcrumb" style="margin-bottom:10px;"><a
href="/wso2registry/system/people">People</a> |
<%=userDetailsAction.getUserName()%> (Settings)</div>
- <% if (errorMessage != null) { %>
- <div class="error-message"><%=errorMessage%></div>
- <% } %>
-
- <!-- Hear comes the box1 table -->
- <div class="box1-head">
- <table cellspacing="0" cellpadding="0" border="0" style="width:100%">
- <tr>
- <td valign="top" style="padding-top:0px;width:14px;"><img
src="/wso2registry/admin/images/box1-lefttop.jpg" /></td>
- <td valign="top">
- <h2><%=userDetailsAction.getUserName()%></h2>
+<% if (errorMessage != null) { %>
+<div class="error-message"><%=errorMessage%></div>
+<% } %>
+
+<!-- Hear comes the box1 table -->
+<div class="box1-head">
+ <table cellspacing="0" cellpadding="0" border="0" style="width:100%">
+ <tr>
+ <td valign="top" style="padding-top:0px;width:14px;"><img
src="/wso2registry/admin/images/box1-lefttop.jpg" /></td>
+ <td valign="top">
+ <h2><%=userDetailsAction.getUserName()%></h2>
+ </td>
+ <td align="right" valign="top">
+ <a href="#"
onclick="showHideCommon('userIconExpanded');showHideCommon('userIconMinimized');showHideCommon('userExpanded');showHideCommon('userMinimized');">
+ <img src="/wso2registry/admin/images/icon-expanded.gif"
border="0" align="top" id="userIconExpanded" />
+ <img src="/wso2registry/admin/images/icon-minimized.gif"
border="0" align="top" id="userIconMinimized" style="display:none;" />
+ </a>
+ </td>
+ <td valign="top" align="right" style="width:14px;
padding-top:0px;" ><img src="/wso2registry/admin/images/box1-righttop.jpg"
/></td>
+ </tr>
+ </table>
+</div>
+<div class="box1-mid" id="userMinimized" style="display:none;">
+ Expand to view details
+</div>
+<div class="box1-mid" id="userExpanded">
+ <!-- all the content goes here -->
+ <div id="friendlyNameDiv">
+ <table cellpadding="0" cellspacing="0" border="0"
class="simple-data-table" style="width:400px;margin-bottom:10px;">
+ <tr id="friendlyNameView">
+ <th style="width:140px; height:25px;">Friendly name:</th>
+ <td style="text-align:right;width:20px;" align="right">
+ <a
onclick="showHideCommon('friendlyNameEdit');showHideCommon('friendlyNameView');"
title="Edit Friendly Name" href="#">
+ <img id="mainIconExpanded" border="0" align="bottom"
src="/wso2registry/admin/images/icon-edit.gif"/>
+ </a>
</td>
- <td align="right" valign="top">
- <a href="#"
onclick="showHideCommon('userIconExpanded');showHideCommon('userIconMinimized');showHideCommon('userExpanded');showHideCommon('userMinimized');">
- <img
src="/wso2registry/admin/images/icon-expanded.gif" border="0" align="top"
id="userIconExpanded" />
- <img
src="/wso2registry/admin/images/icon-minimized.gif" border="0" align="top"
id="userIconMinimized" style="display:none;" />
+ <td>
+ <%=userDetailsAction.getFriendlyName()%>
+ </td>
+ </tr>
+ <tr id="friendlyNameEdit" style="display:none;">
+ <th style="width:140px; height:25px;">Friendly name:</th>
+ <td style="text-align:right;width:20px;" align="right">
+ <a title="Save Friendly Name" href="#editButton"
onclick="showHideCommon('friendlyNameEdit');showHideCommon('friendlyNameView');saveFriendlyName('<%=userDetailsAction.getUserName()%>');">
+ <img border="0" align="bottom"
src="/wso2registry/admin/images/save-button.gif"/>
</a>
</td>
- <td valign="top" align="right" style="width:14px;
padding-top:0px;" ><img src="/wso2registry/admin/images/box1-righttop.jpg"
/></td>
+ <td>
+ <input type="text" id="friendlyName"
value="<%=userDetailsAction.getFriendlyName()%>" />
+ </td>
</tr>
</table>
</div>
- <div class="box1-mid" id="userMinimized" style="display:none;">
- Expand to view details
- </div>
- <div class="box1-mid" id="userExpanded">
- <!-- all the content goes here -->
- <table cellpadding="0" cellspacing="0" border="0"
class="simple-data-table" style="width:400px;margin-bottom:10px;">
- <tr id="friendlyNameView">
- <th style="width:140px; height:25px;">Friendly
name:</th>
- <td style="text-align:right;width:20px;" align="right">
- <a
onclick="showHideCommon('friendlyNameEdit');showHideCommon('friendlyNameView');"
title="Edit Friendly Name" href="#">
- <img id="mainIconExpanded" border="0"
align="bottom" src="/wso2registry/admin/images/icon-edit.gif"/>
- </a>
- </td>
- <td>
- <%=userDetailsAction.getFriendlyName()%>
- </td>
- </tr>
- <tr id="friendlyNameEdit" style="display:none;">
- <th style="width:140px; height:25px;">Friendly
name:</th>
- <td style="text-align:right;width:20px;" align="right">
- <a title="Save Friendly Name"
href="#editButton"
onclick="showHideCommon('friendlyNameEdit');showHideCommon('friendlyNameView');saveFriendlyName('<%=userDetailsAction.getUserName()%>');">
- <img border="0" align="bottom"
src="/wso2registry/admin/images/save-button.gif"/>
- </a>
- </td>
- <td>
- <input type="text" id="friendlyName"
value="<%=userDetailsAction.getFriendlyName()%>" />
- </td>
- </tr>
- <tr id="passwordView">
- <th style="width:140px">Password:</th>
- <td style="text-align:right;width:20px;" align="right">
- <a
onclick="showHideCommon('passwordView');showHideCommon('passwordEdit1');showHideCommon('passwordEdit2');showHideCommon('passwordEdit3');"
title="Edit Password" href="#">
- <img border="0" align="bottom"
src="/wso2registry/admin/images/icon-edit.gif"/>
- </a>
- </td>
- <td>
- - - - - - - -
- </td>
- </tr>
- <tr id="passwordEdit1" style="display:none;">
- <td style="width:140px"><h3
style="margin-bottom:0px;">Editing Password:</h3></td>
- <td style="text-align:right;width:20px;" align="right">
- <a
onclick="showHideCommon('passwordView');showHideCommon('passwordEdit1');showHideCommon('passwordEdit2');showHideCommon('passwordEdit3');"
title="Save Password" href="#">
- <img border="0" align="bottom"
src="/wso2registry/admin/images/save-button.gif"/>
- </a>
- </td>
- <td></td>
- </tr>
- <tr id="passwordEdit2" style="display:none;">
- <td style="width:140px">New
Password</td><td></td><td><input type="password" /></td>
- </tr>
- <tr id="passwordEdit3" style="display:none;">
- <td style="width:140px">Confirm
Password</td><td></td><td><input type="password" /></td>
- </tr>
- </table>
-
- <h3>Add roles to <%=userDetailsAction.getUserName()%></h3>
-
- <form action="/wso2registry/system/addUserToRole" method="post">
- <input type="hidden" name="userName"
value="<%=userDetailsAction.getUserName()%>"/>
- <select name="roleToAdd">
- <%
- Iterator iRoles =
userDetailsAction.getAllRoles().iterator();
- while (iRoles.hasNext()) {
- String roleName = (String) iRoles.next();
- %>
- <option value="<%=roleName%>"><%=roleName%></option>
- <% } %>
- </select>
- <input type="submit" class="button" value="Add"/>
- </form>
- <h3>Available roles to <%=userDetailsAction.getUserName()%></h3>
- <table cellpadding="0" cellspacing="0" border="0" style="width:600px;"
class="data-table">
- <tr>
- <th>Role Name</th>
- <th style="width:100px;" align="left">Action</th>
-
- </tr>
- <%
- Iterator iUserRoles =
userDetailsAction.getUserRoles().iterator();
- while (iUserRoles.hasNext()) {
- String userRole = (String) iUserRoles.next();
- %>
- <tr><td><%=userRole%></td><td><a
href="/wso2registry/system/removeUserFromRole?user=<%=userDetailsAction.getUserName()%>&role=<%=userRole%>"><img
src="/wso2registry/admin/images/icon-trash.gif" border="0" /></a></td></tr>
- <% } %>
-
- </table>
- <h3 style="margin-top:10px;">Recent activity of
<%=userDetailsAction.getUserName()%></h3>
-
- <table cellspacing="0" cellpadding="0" border="0" style="width:100%">
+ <table cellpadding="0" cellspacing="0" border="0"
class="simple-data-table" style="width:400px;margin-bottom:10px;">
+ <tr id="passwordView">
+ <th style="width:140px">Password:</th>
+ <td style="text-align:right;width:20px;" align="right">
+ <a
onclick="showHideCommon('passwordView');showHideCommon('passwordEdit1');showHideCommon('passwordEdit2');showHideCommon('passwordEdit3');"
title="Edit Password" href="#">
+ <img border="0" align="bottom"
src="/wso2registry/admin/images/icon-edit.gif"/>
+ </a>
+ </td>
+ <td>
+ - - - - - - -
+ </td>
+ </tr>
+ <tr id="passwordEdit1" style="display:none;">
+ <td style="width:140px"><h3 style="margin-bottom:0px;">Editing
Password:</h3></td>
+ <td style="text-align:right;width:20px;" align="right">
+ <a
onclick="showHideCommon('passwordView');showHideCommon('passwordEdit1');showHideCommon('passwordEdit2');showHideCommon('passwordEdit3');"
title="Save Password" href="#">
+ <img border="0" align="bottom"
src="/wso2registry/admin/images/save-button.gif"/>
+ </a>
+ </td>
+ <td></td>
+ </tr>
+ <tr id="passwordEdit2" style="display:none;">
+ <td style="width:140px">New Password</td><td></td><td><input
type="password" /></td>
+ </tr>
+ <tr id="passwordEdit3" style="display:none;">
+ <td style="width:140px">Confirm Password</td><td></td><td><input
type="password" /></td>
+ </tr>
+ </table>
+
+ <h3>Add roles to <%=userDetailsAction.getUserName()%></h3>
+
+ <form action="/wso2registry/system/addUserToRole" method="post">
+ <input type="hidden" name="userName"
value="<%=userDetailsAction.getUserName()%>"/>
+ <select name="roleToAdd">
<%
- Iterator iActivity =
userDetailsAction.getUserActivity().iterator();
- while (iActivity.hasNext()) {
- String activity = (String) iActivity.next();
+ Iterator iRoles = userDetailsAction.getAllRoles().iterator();
+ while (iRoles.hasNext()) {
+ String roleName = (String) iRoles.next();
%>
- <tr><td><%=activity%></td></tr>
+ <option value="<%=roleName%>"><%=roleName%></option>
<% } %>
- </table>
- <!-- End box1-mid div -->
- </div>
- <div class="box1-bot">
- <table cellspacing="0" cellpadding="0" border="0" style="width:100%" >
- <tr>
- <td><img src="/wso2registry/admin/images/box1-leftbot.jpg"
/></td>
- <td align="right"><img
src="/wso2registry/admin/images/box1-rightbot.jpg" /></td>
- </tr>
- </table>
- </div>
+ </select>
+ <input type="submit" class="button" value="Add"/>
+ </form>
+ <h3>Available roles to <%=userDetailsAction.getUserName()%></h3>
+ <table cellpadding="0" cellspacing="0" border="0" style="width:600px;"
class="data-table">
+ <tr>
+ <th>Role Name</th>
+ <th style="width:100px;" align="left">Action</th>
+
+ </tr>
+ <%
+ Iterator iUserRoles = userDetailsAction.getUserRoles().iterator();
+ while (iUserRoles.hasNext()) {
+ String userRole = (String) iUserRoles.next();
+ %>
+ <tr><td><%=userRole%></td><td><a
href="/wso2registry/system/removeUserFromRole?user=<%=userDetailsAction.getUserName()%>&role=<%=userRole%>"><img
src="/wso2registry/admin/images/icon-trash.gif" border="0" /></a></td></tr>
+ <% } %>
+
+ </table>
+ <h3 style="margin-top:10px;">Recent activity of
<%=userDetailsAction.getUserName()%></h3>
+
+ <table cellspacing="0" cellpadding="0" border="0" style="width:100%">
+ <%
+ Iterator iActivity =
userDetailsAction.getUserActivity().iterator();
+ while (iActivity.hasNext()) {
+ String activity = (String) iActivity.next();
+ %>
+ <tr><td><%=activity%></td></tr>
+ <% } %>
+ </table>
+ <!-- End box1-mid div -->
+</div>
+<div class="box1-bot">
+ <table cellspacing="0" cellpadding="0" border="0" style="width:100%" >
+ <tr>
+ <td><img src="/wso2registry/admin/images/box1-leftbot.jpg" /></td>
+ <td align="right"><img
src="/wso2registry/admin/images/box1-rightbot.jpg" /></td>
+ </tr>
+ </table>
+</div>
_______________________________________________
Registry-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/registry-dev
