Commit eaf9479d authored by Gaston Dombiak's avatar Gaston Dombiak Committed by gaston

Replaced userID with username


git-svn-id: http://svn.igniterealtime.org/svn/repos/messenger/trunk@312 b35dd754-fafc-0310-a699-88a17e54d16e
parent 0de90aa2
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
<jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" /> <jsp:useBean id="pageinfo" scope="request" class="org.jivesoftware.admin.AdminPageBean" />
<% // Title of this page and breadcrumbs <% // Title of this page and breadcrumbs
String title = "Change Password"; String title = "Delete User";
pageinfo.setTitle(title); pageinfo.setTitle(title);
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "main.jsp")); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb("Main", "main.jsp"));
pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "user-password.jsp?username="+username)); pageinfo.getBreadcrumbs().add(new AdminPageBean.Breadcrumb(title, "user-password.jsp?username="+username));
...@@ -72,7 +72,7 @@ Are you sure you want to delete the user ...@@ -72,7 +72,7 @@ Are you sure you want to delete the user
from the system? from the system?
</p> </p>
<c:if test="${admin.user.ID == param.userID}"> <c:if test="${admin.user.username == param.username}">
<p class="jive-warning-text"> <p class="jive-warning-text">
Warning! You are about to delete your <b>own</b> user account. Are you sure you want to Warning! You are about to delete your <b>own</b> user account. Are you sure you want to
do this? Doing so will log you out of the system immediately. do this? Doing so will log you out of the system immediately.
......
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
<c:set var="breadcrumbs" value="${admin.breadCrumbs}" /> <c:set var="breadcrumbs" value="${admin.breadCrumbs}" />
<c:set target="${breadcrumbs}" property="Home" value="main.jsp" /> <c:set target="${breadcrumbs}" property="Home" value="main.jsp" />
<c:set target="${breadcrumbs}" property="User Summary" value="user-summary.jsp" /> <c:set target="${breadcrumbs}" property="User Summary" value="user-summary.jsp" />
<c:set target="${breadcrumbs}" property="User Properties" value="user-edit-form.jsp?userID=${param.userID}" /> <c:set target="${breadcrumbs}" property="User Properties" value="user-edit-form.jsp?username=${param.username}" />
<c:set target="${breadcrumbs}" property="${title}" value="user-password?userID=${param.userID}" /> <c:set target="${breadcrumbs}" property="${title}" value="user-password?username=${param.username}" />
<jsp:include page="top.jsp" flush="true" /> <jsp:include page="top.jsp" flush="true" />
<c:set var="tab" value="pass" /> <c:set var="tab" value="pass" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment