Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

SAK-7574 merge from trunk

git-svn-id: https://source.sakaiproject.org/svn/user/branches/sakai-2.8.x@95031 66ffb92e-73f9-0310-93c1-f5514f145a0a
  • Loading branch information...
commit b4a3d2a20e76e4bbb32c870d7153c389d6a10afb 1 parent 1770838
ottenhoff@longsight.com authored
View
19 user-tool/tool/src/java/org/sakaiproject/user/tool/UsersAction.java
@@ -775,6 +775,9 @@ public void doCancel(RunData data, Context context)
public void doRemove(RunData data, Context context)
{
SessionState state = ((JetspeedRunData) data).getPortletSessionState(((JetspeedRunData) data).getJs_peid());
+
+ // set mode so we can skip some checks in readUserForm
+ state.setAttribute("mode", "remove");
// read the form - if rejected, leave things as they are
if (!readUserForm(data, state)) return;
@@ -1026,14 +1029,16 @@ else if ((mode != null) && (mode.equalsIgnoreCase("edit")) && (!singleUser))
}
}
- // make sure we have matching password fields
- if (StringUtil.different(pw, pwConfirm))
- {
- addAlert(state, rb.getString("usecre.pass"));
- return false;
+ if (mode == null || !mode.equalsIgnoreCase("remove")) {
+ // make sure we have matching password fields
+ if (StringUtil.different(pw, pwConfirm))
+ {
+ addAlert(state, rb.getString("usecre.pass"));
+ return false;
+ }
+
+ if (pw != null) user.setPassword(pw);
}
-
- if (pw != null) user.setPassword(pw);
}
return true;
Please sign in to comment.
Something went wrong with that request. Please try again.