comparison: src/main/java/de/uapcore/lightpit/modules/ProjectsModule.java
src/main/java/de/uapcore/lightpit/modules/ProjectsModule.java
- changeset 65
- 9861a68a4612
- parent 64
- 0f1746c6abfb
- child 67
- d15779cf3982
equal
deleted
inserted
replaced
| 64:0f1746c6abfb | 65:9861a68a4612 |
|---|---|
| 96 | 96 |
| 97 @RequestMapping(requestPath = "edit", method = HttpMethod.GET) | 97 @RequestMapping(requestPath = "edit", method = HttpMethod.GET) |
| 98 public ResponseType edit(HttpServletRequest req, DataAccessObjects dao) throws SQLException { | 98 public ResponseType edit(HttpServletRequest req, DataAccessObjects dao) throws SQLException { |
| 99 final var projectDao = dao.getProjectDao(); | 99 final var projectDao = dao.getProjectDao(); |
| 100 | 100 |
| 101 req.setAttribute("project", findByParameter(req, Integer.class, "id", projectDao::find)); | 101 req.setAttribute("project", findByParameter(req, Integer.class, "id", |
| 102 projectDao::find).orElse(new Project(-1))); | |
| 102 setDynamicFragment(req, "project-form"); | 103 setDynamicFragment(req, "project-form"); |
| 103 | 104 |
| 104 return ResponseType.HTML; | 105 return ResponseType.HTML; |
| 105 } | 106 } |
| 106 | 107 |
| 153 if (selectedProject == null) { | 154 if (selectedProject == null) { |
| 154 resp.sendError(HttpServletResponse.SC_FORBIDDEN); | 155 resp.sendError(HttpServletResponse.SC_FORBIDDEN); |
| 155 return ResponseType.NONE; | 156 return ResponseType.NONE; |
| 156 } | 157 } |
| 157 | 158 |
| 158 req.setAttribute("version", findByParameter(req, Integer.class, "id", dao.getVersionDao()::find)); | 159 req.setAttribute("version", findByParameter(req, Integer.class, "id", |
| 160 dao.getVersionDao()::find).orElse(new Version(-1, selectedProject))); | |
| 159 req.setAttribute("versionStatusEnum", VersionStatus.values()); | 161 req.setAttribute("versionStatusEnum", VersionStatus.values()); |
| 160 | 162 |
| 161 setDynamicFragment(req, "version-form"); | 163 setDynamicFragment(req, "version-form"); |
| 162 | 164 |
| 163 return ResponseType.HTML; | 165 return ResponseType.HTML; |
| 215 if (selectedProject == null) { | 217 if (selectedProject == null) { |
| 216 resp.sendError(HttpServletResponse.SC_FORBIDDEN); | 218 resp.sendError(HttpServletResponse.SC_FORBIDDEN); |
| 217 return ResponseType.NONE; | 219 return ResponseType.NONE; |
| 218 } | 220 } |
| 219 | 221 |
| 220 req.setAttribute("issue", findByParameter(req, Integer.class, "id", dao.getIssueDao()::find)); | 222 req.setAttribute("issue", findByParameter(req, Integer.class, "id", |
| 223 dao.getIssueDao()::find).orElse(new Issue(-1, selectedProject))); | |
| 221 req.setAttribute("issueStatusEnum", IssueStatus.values()); | 224 req.setAttribute("issueStatusEnum", IssueStatus.values()); |
| 222 req.setAttribute("issueCategoryEnum", IssueCategory.values()); | 225 req.setAttribute("issueCategoryEnum", IssueCategory.values()); |
| 223 | 226 |
| 224 setDynamicFragment(req, "issue-form"); | 227 setDynamicFragment(req, "issue-form"); |
| 225 | 228 |
