diff -r 2223bd79e0c6 -r 821c4950b619 src/main/java/de/uapcore/lightpit/modules/ProjectsModule.java --- a/src/main/java/de/uapcore/lightpit/modules/ProjectsModule.java Tue May 19 18:49:48 2020 +0200 +++ b/src/main/java/de/uapcore/lightpit/modules/ProjectsModule.java Tue May 19 19:34:57 2020 +0200 @@ -74,12 +74,6 @@ } @RequestMapping(method = HttpMethod.GET) - public ResponseType indexRedirect(HttpServletResponse resp) throws IOException { - resp.sendRedirect("index/"); - return ResponseType.NONE; - } - - @RequestMapping(requestPath = "index", method = HttpMethod.GET, menuKey = "menu.index") public ResponseType index(HttpServletRequest req, DataAccessObjects dao) throws SQLException { final var projectList = dao.getProjectDao().list(); @@ -120,7 +114,7 @@ dao.getProjectDao().saveOrUpdate(project); - setRedirectLocation(req, "./projects/index/"); + setRedirectLocation(req, "./projects/"); setDynamicFragment(req, Constants.DYN_FRAGMENT_COMMIT_SUCCESSFUL); LOG.debug("Successfully updated project {}", project.getName()); } catch (NoSuchElementException | NumberFormatException | SQLException ex) { @@ -135,8 +129,8 @@ return ResponseType.HTML; } - @RequestMapping(requestPath = "versions", method = HttpMethod.GET, menuKey = "menu.versions") - public ResponseType versions(HttpServletRequest req, HttpServletResponse resp, DataAccessObjects dao) throws IOException, SQLException { + @RequestMapping(requestPath = "view", method = HttpMethod.GET) + public ResponseType view(HttpServletRequest req, HttpServletResponse resp, DataAccessObjects dao) throws IOException, SQLException { final var selectedProject = getSelectedProject(req, dao); if (selectedProject == null) { resp.sendError(HttpServletResponse.SC_FORBIDDEN); @@ -144,7 +138,9 @@ } req.setAttribute("versions", dao.getVersionDao().list(selectedProject)); - setDynamicFragment(req, "versions"); + req.setAttribute("issues", dao.getIssueDao().list(selectedProject)); + + setDynamicFragment(req, "project-details"); return ResponseType.HTML; } @@ -197,21 +193,6 @@ return ResponseType.HTML; } - - @RequestMapping(requestPath = "issues", method = HttpMethod.GET, menuKey = "menu.issues") - public ResponseType issues(HttpServletRequest req, HttpServletResponse resp, DataAccessObjects dao) throws IOException, SQLException { - final var selectedProject = getSelectedProject(req, dao); - if (selectedProject == null) { - resp.sendError(HttpServletResponse.SC_FORBIDDEN); - return ResponseType.NONE; - } - - req.setAttribute("issues", dao.getVersionDao().list(selectedProject)); - setDynamicFragment(req, "issues"); - - return ResponseType.HTML; - } - @RequestMapping(requestPath = "issues/edit", method = HttpMethod.GET) public ResponseType editIssue(HttpServletRequest req, HttpServletResponse resp, DataAccessObjects dao) throws IOException, SQLException { final var selectedProject = getSelectedProject(req, dao);