35,7 → 35,8 |
throws Exception |
{ |
if("submit".equals(mapping.getParameter())) { |
initUserList(request); |
User user = (User)request.getSession().getAttribute("user"); |
initUserList(request, user); |
} |
} |
|
72,7 → 73,7 |
showForm.set("comment", domain.getComment()); |
} |
|
initUserList(request); |
initUserList(request, user); |
return mapping.findForward("default"); |
} |
else if("delete".equals(mapping.getParameter())) { |
97,7 → 98,7 |
} |
|
domain.setName((String)theForm.get("name")); |
domain.setOwner(UserManager.getInstance().get( |
domain.setOwner(UserManager.getInstance().get(user, |
StringConverter.parseLong(theForm.get("owner")))); |
|
domain.setEnabled((Boolean)theForm.get("enabled")); |
112,10 → 113,10 |
} |
} |
|
private void initUserList(HttpServletRequest request) |
private void initUserList(HttpServletRequest request, User user) |
throws Exception |
{ |
List list = new ArrayList(UserManager.getInstance().listUsers()); |
List list = new ArrayList(UserManager.getInstance().listUsers(user)); |
Collections.sort(list, UserManager.LOGIN_COMPARATOR); |
request.setAttribute("users", list); |
} |