Author: channa
Date: Wed Jan 9 07:27:17 2008
New Revision: 12080
Log:
Fixing bouncebacks of user management pages (MASHUP-467 and related).
Modified:
trunk/mashup/java/modules/www/add_user.jsp
trunk/mashup/java/modules/www/manage_users.jsp
trunk/mashup/java/modules/www/register_self_infocard.jsp
Modified: trunk/mashup/java/modules/www/add_user.jsp
==============================================================================
--- trunk/mashup/java/modules/www/add_user.jsp (original)
+++ trunk/mashup/java/modules/www/add_user.jsp Wed Jan 9 07:27:17 2008
@@ -58,11 +58,16 @@
Registry registry = RegistryUtils.getRegistry(request);
String bounceback = request.getParameter("bounceback");
String title = "Add User";
+
if (bounceback == null) {
bounceback = "index.jsp";
} else {
bounceback = URLDecoder.decode(bounceback, "UTF-8");
}
+
+ if (userName != null) {
+ userName = URLDecoder.decode(userName, "UTF-8");
+ }
%>
<jsp:useBean id="addUserHandler"
class="org.wso2.mashup.webapp.userprofile.AddUserBean"
scope="request">
Modified: trunk/mashup/java/modules/www/manage_users.jsp
==============================================================================
--- trunk/mashup/java/modules/www/manage_users.jsp (original)
+++ trunk/mashup/java/modules/www/manage_users.jsp Wed Jan 9 07:27:17 2008
@@ -77,7 +77,7 @@
<div id="search"></div>
<div id="content">
<div class="mashup_title">Manage Users</div>
- <div align="right" ><a href="add_user.jsp?firstcall=true"
class="edit-link"><img src="images/add_user.gif" title="Add user" border="0"
align="absmiddle" /></a><a href="add_user.jsp?firstcall=true"
class="edit-link">Add user</a>
+ <div align="right" ><a href="add_user.jsp?firstcall=true"
class="edit-link"><img src="images/add_user.gif" title="Add user" border="0"
align="absmiddle" /></a><a
href="add_user.jsp?firstcall=true&bounceback=<%=URLEncoder.encode(thisPage,"UTF-8")%>"
class="edit-link">Add user</a>
</div>
<table width="100%" border="0" cellpadding="3" cellspacing="0"
style="margin-left:0px; " class="data">
<tr >
@@ -93,8 +93,8 @@
<tr class="results">
<td><img src="images/user.gif" align="absmiddle"></td>
<td><%= fullName %></td>
- <td align="center"><a
href="add_user.jsp?username=<%=keys[userCount]%>&editmode=true&firstcall=true"><img
src="images/edit.gif" alt="Edit user" title="Edit user" border="0"></a></td>
- <td align="center"><a href="delete_user.jsp?username=<%=
URLEncoder.encode(keys[userCount],"UTF-8") %>&fullname=<%= fullName
%>&firstcall=true"><img src="images/delete.gif" alt="Delete user" title="Delete
user" border="0"></a></td>
+ <td align="center"><a
href="add_user.jsp?username=<%=keys[userCount]%>&editmode=true&firstcall=true&bounceback=<%=URLEncoder.encode(thisPage,"UTF-8")%>"><img
src="images/edit.gif" alt="Edit user" title="Edit user" border="0"></a></td>
+ <td align="center"><a href="delete_user.jsp?username=<%=
URLEncoder.encode(keys[userCount],"UTF-8") %>&fullname=<%=
URLEncoder.encode(fullName,"UTF-8")
%>&firstcall=true&bounceback=<%=URLEncoder.encode(thisPage,"UTF-8")%>"><img
src="images/delete.gif" alt="Delete user" title="Delete user"
border="0"></a></td>
</tr>
<% }
}%>
Modified: trunk/mashup/java/modules/www/register_self_infocard.jsp
==============================================================================
--- trunk/mashup/java/modules/www/register_self_infocard.jsp (original)
+++ trunk/mashup/java/modules/www/register_self_infocard.jsp Wed Jan 9
07:27:17 2008
@@ -101,7 +101,7 @@
if ("Log in".equals(infoCardPresented) && !infocardOk) { %>
<div class="mashup_title">Infocard Error</div>
<div> Infocard submission failed. Please register using another
card or by entering
- data manually <a
href="signin.jsp?bounceback=<%=URLEncoder.encode(thisPage,"UTF-8")%>">here</a>.
+ data manually <a
href="register_self.jsp?firstcall=true&bounceback=<%=URLEncoder.encode(thisPage,"UTF-8")%>">here</a>.
</div>
<% } else { %>
<div class="mashup_title">Your infocard details have been added and will
be verified via e-mail</div>
_______________________________________________
Mashup-dev mailing list
[email protected]
http://www.wso2.org/cgi-bin/mailman/listinfo/mashup-dev
