diff -r 672b5003cafe -r 91d1fc2a3a14 src/main/java/de/uapcore/lightpit/modules/ProjectsModule.java --- a/src/main/java/de/uapcore/lightpit/modules/ProjectsModule.java Fri May 22 17:19:09 2020 +0200 +++ b/src/main/java/de/uapcore/lightpit/modules/ProjectsModule.java Fri May 22 17:26:27 2020 +0200 @@ -111,7 +111,7 @@ final var projectList = dao.getProjectDao().list(); req.setAttribute("projects", projectList); - setDynamicFragment(req, "projects"); + setContentPage(req, "projects"); setStylesheet(req, "projects"); final var selectedProject = getSelectedProject(req, dao); @@ -130,7 +130,7 @@ } req.setAttribute("users", dao.getUserDao().list()); - setDynamicFragment(req, "project-form"); + setContentPage(req, "project-form"); } @RequestMapping(requestPath = "edit", method = HttpMethod.GET) @@ -161,7 +161,7 @@ dao.getProjectDao().saveOrUpdate(project); setRedirectLocation(req, "./projects/"); - setDynamicFragment(req, Constants.DYN_FRAGMENT_COMMIT_SUCCESSFUL); + setContentPage(req, Constants.JSP_COMMIT_SUCCESSFUL); LOG.debug("Successfully updated project {}", project.getName()); } catch (NoSuchElementException | NumberFormatException | SQLException ex) { // TODO: set request attribute with error text @@ -187,7 +187,7 @@ // TODO: add more levels depending on last visited location setBreadcrumbs(req, getBreadcrumbs(1, selectedProject)); - setDynamicFragment(req, "project-details"); + setContentPage(req, "project-details"); return ResponseType.HTML; } @@ -196,7 +196,7 @@ req.setAttribute("version", version.orElse(new Version(-1, selectedProject))); req.setAttribute("versionStatusEnum", VersionStatus.values()); - setDynamicFragment(req, "version-form"); + setContentPage(req, "version-form"); } @RequestMapping(requestPath = "versions/edit", method = HttpMethod.GET) @@ -231,7 +231,7 @@ dao.getVersionDao().saveOrUpdate(version); setRedirectLocation(req, "./projects/versions/"); - setDynamicFragment(req, Constants.DYN_FRAGMENT_COMMIT_SUCCESSFUL); + setContentPage(req, Constants.JSP_COMMIT_SUCCESSFUL); LOG.debug("Successfully updated version {} for project {}", version.getName(), selectedProject.getName()); } catch (NoSuchElementException | NumberFormatException | SQLException ex) { // TODO: set request attribute with error text @@ -250,7 +250,7 @@ req.setAttribute("issueCategoryEnum", IssueCategory.values()); req.setAttribute("versions", dao.getVersionDao().list(selectedProject)); - setDynamicFragment(req, "issue-form"); + setContentPage(req, "issue-form"); } @RequestMapping(requestPath = "issues/edit", method = HttpMethod.GET) @@ -285,7 +285,7 @@ dao.getIssueDao().saveOrUpdate(issue); setRedirectLocation(req, "./projects/issues/"); - setDynamicFragment(req, Constants.DYN_FRAGMENT_COMMIT_SUCCESSFUL); + setContentPage(req, Constants.JSP_COMMIT_SUCCESSFUL); LOG.debug("Successfully updated issue {} for project {}", issue.getId(), selectedProject.getName()); } catch (NoSuchElementException | NumberFormatException | SQLException ex) { // TODO: set request attribute with error text