| 35,7 → 35,8 |
|---|
| throws Exception |
| { |
| if("submit".equals(mapping.getParameter())) { |
| initUserList(request); |
| User user = (User)request.getSession().getAttribute("user"); |
| initUserList(request, user); |
| } |
| } |
| |
| 73,7 → 74,7 |
|---|
| showForm.set("comment", u.getComment()); |
| } |
| |
| initUserList(request); |
| initUserList(request, user); |
| return mapping.findForward("default"); |
| } |
| else if("delete".equals(mapping.getParameter())) { |
| 104,7 → 105,7 |
|---|
| if(ownerId == null) |
| u.setOwner(null); |
| else |
| u.setOwner(UserManager.getInstance().get(ownerId)); |
| u.setOwner(UserManager.getInstance().get(user, ownerId)); |
| |
| u.setEnabled((Boolean)theForm.get("enabled")); |
| u.setComment((String)theForm.get("comment")); |
| 118,10 → 119,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); |
| } |