comparison: src/main/java/de/uapcore/lightpit/modules/UsersModule.java
src/main/java/de/uapcore/lightpit/modules/UsersModule.java
- changeset 74
- 91d1fc2a3a14
- parent 66
- 635ae67e73b5
- child 75
- 33b6843fdf8a
equal
deleted
inserted
replaced
| 73:672b5003cafe | 74:91d1fc2a3a14 |
|---|---|
| 56 @RequestMapping(method = HttpMethod.GET) | 56 @RequestMapping(method = HttpMethod.GET) |
| 57 public ResponseType index(HttpServletRequest req, DataAccessObjects dao) throws SQLException { | 57 public ResponseType index(HttpServletRequest req, DataAccessObjects dao) throws SQLException { |
| 58 final var userDao = dao.getUserDao(); | 58 final var userDao = dao.getUserDao(); |
| 59 | 59 |
| 60 req.setAttribute("users", userDao.list()); | 60 req.setAttribute("users", userDao.list()); |
| 61 setDynamicFragment(req, "users"); | 61 setContentPage(req, "users"); |
| 62 | 62 |
| 63 return ResponseType.HTML; | 63 return ResponseType.HTML; |
| 64 } | 64 } |
| 65 | 65 |
| 66 @RequestMapping(requestPath = "edit", method = HttpMethod.GET) | 66 @RequestMapping(requestPath = "edit", method = HttpMethod.GET) |
| 67 public ResponseType edit(HttpServletRequest req, DataAccessObjects dao) throws SQLException { | 67 public ResponseType edit(HttpServletRequest req, DataAccessObjects dao) throws SQLException { |
| 68 | 68 |
| 69 req.setAttribute("user", findByParameter(req, Integer.class, "id", | 69 req.setAttribute("user", findByParameter(req, Integer.class, "id", |
| 70 dao.getUserDao()::find).orElse(new User(-1))); | 70 dao.getUserDao()::find).orElse(new User(-1))); |
| 71 | 71 |
| 72 setDynamicFragment(req, "user-form"); | 72 setContentPage(req, "user-form"); |
| 73 | 73 |
| 74 return ResponseType.HTML; | 74 return ResponseType.HTML; |
| 75 } | 75 } |
| 76 | 76 |
| 77 @RequestMapping(requestPath = "commit", method = HttpMethod.POST) | 77 @RequestMapping(requestPath = "commit", method = HttpMethod.POST) |
| 86 getParameter(req, String.class, "mail").ifPresent(user::setMail); | 86 getParameter(req, String.class, "mail").ifPresent(user::setMail); |
| 87 | 87 |
| 88 dao.getUserDao().saveOrUpdate(user); | 88 dao.getUserDao().saveOrUpdate(user); |
| 89 | 89 |
| 90 setRedirectLocation(req, "./teams/"); | 90 setRedirectLocation(req, "./teams/"); |
| 91 setDynamicFragment(req, Constants.DYN_FRAGMENT_COMMIT_SUCCESSFUL); | 91 setContentPage(req, Constants.JSP_COMMIT_SUCCESSFUL); |
| 92 | 92 |
| 93 LOG.debug("Successfully updated user {}", user.getUsername()); | 93 LOG.debug("Successfully updated user {}", user.getUsername()); |
| 94 } catch (NoSuchElementException | NumberFormatException | SQLException ex) { | 94 } catch (NoSuchElementException | NumberFormatException | SQLException ex) { |
| 95 // TODO: set request attribute with error text | 95 // TODO: set request attribute with error text |
| 96 req.setAttribute("user", user); | 96 req.setAttribute("user", user); |
| 97 setDynamicFragment(req, "user-form"); | 97 setContentPage(req, "user-form"); |
| 98 LOG.warn("Form validation failure: {}", ex.getMessage()); | 98 LOG.warn("Form validation failure: {}", ex.getMessage()); |
| 99 LOG.debug("Details:", ex); | 99 LOG.debug("Details:", ex); |
| 100 } | 100 } |
| 101 | 101 |
| 102 return ResponseType.HTML; | 102 return ResponseType.HTML; |
