46,9 → 46,11 |
User user = (User)request.getSession().getAttribute("user"); |
|
if("list".equals(mapping.getParameter())) { |
List list = new ArrayList(SystemUserManager.getInstance().listSystemUsers()); |
List list = new ArrayList(SystemUserManager.getInstance().listSystemUsers(user)); |
Collections.sort(list, SystemUserManager.NAME_COMPARATOR); |
request.setAttribute("users", list); |
request.setAttribute("allowedToCreate", |
new Boolean(SystemUserManager.getInstance().allowedToCreate(user))); |
|
return mapping.findForward("default"); |
} |
62,7 → 64,7 |
showForm.set("enabled", new Boolean(true)); |
} |
else { |
SystemUser u = SystemUserManager.getInstance().get(userId); |
SystemUser u = SystemUserManager.getInstance().get(user, userId); |
showForm.set("uid", StringConverter.toString(u.getUid())); |
showForm.set("name", u.getName()); |
if(u.getOwner() != null) |
77,9 → 79,9 |
else if("delete".equals(mapping.getParameter())) { |
DynaActionForm theForm = (DynaActionForm)form; |
Long userId = StringConverter.parseLong(theForm.get("id")); |
SystemUser u = SystemUserManager.getInstance().get(userId); |
SystemUser u = SystemUserManager.getInstance().get(user, userId); |
|
SystemUserManager.getInstance().delete(u); |
SystemUserManager.getInstance().delete(user, u); |
response.sendRedirect(BackPath.findBackPath(request).getBackwardUrl()); |
return null; |
} |
89,10 → 91,10 |
SystemUser u; |
|
if(userId == null) { |
u = SystemUserManager.getInstance().create(); |
u = SystemUserManager.getInstance().create(user); |
} |
else { |
u = SystemUserManager.getInstance().get(userId); |
u = SystemUserManager.getInstance().get(user, userId); |
} |
|
u.setUid(StringConverter.parseInteger(theForm.get("uid"))); |
107,7 → 109,7 |
u.setEnabled((Boolean)theForm.get("enabled")); |
u.setComment((String)theForm.get("comment")); |
|
SystemUserManager.getInstance().save(u); |
SystemUserManager.getInstance().save(user, u); |
response.sendRedirect(BackPath.findBackPath(request).getBackwardUrl()); |
return null; |
} |