1.1 --- a/src/main/java/de/uapcore/lightpit/modules/ProjectsModule.java Fri May 22 17:19:09 2020 +0200 1.2 +++ b/src/main/java/de/uapcore/lightpit/modules/ProjectsModule.java Fri May 22 17:26:27 2020 +0200 1.3 @@ -111,7 +111,7 @@ 1.4 1.5 final var projectList = dao.getProjectDao().list(); 1.6 req.setAttribute("projects", projectList); 1.7 - setDynamicFragment(req, "projects"); 1.8 + setContentPage(req, "projects"); 1.9 setStylesheet(req, "projects"); 1.10 1.11 final var selectedProject = getSelectedProject(req, dao); 1.12 @@ -130,7 +130,7 @@ 1.13 } 1.14 1.15 req.setAttribute("users", dao.getUserDao().list()); 1.16 - setDynamicFragment(req, "project-form"); 1.17 + setContentPage(req, "project-form"); 1.18 } 1.19 1.20 @RequestMapping(requestPath = "edit", method = HttpMethod.GET) 1.21 @@ -161,7 +161,7 @@ 1.22 dao.getProjectDao().saveOrUpdate(project); 1.23 1.24 setRedirectLocation(req, "./projects/"); 1.25 - setDynamicFragment(req, Constants.DYN_FRAGMENT_COMMIT_SUCCESSFUL); 1.26 + setContentPage(req, Constants.JSP_COMMIT_SUCCESSFUL); 1.27 LOG.debug("Successfully updated project {}", project.getName()); 1.28 } catch (NoSuchElementException | NumberFormatException | SQLException ex) { 1.29 // TODO: set request attribute with error text 1.30 @@ -187,7 +187,7 @@ 1.31 // TODO: add more levels depending on last visited location 1.32 setBreadcrumbs(req, getBreadcrumbs(1, selectedProject)); 1.33 1.34 - setDynamicFragment(req, "project-details"); 1.35 + setContentPage(req, "project-details"); 1.36 1.37 return ResponseType.HTML; 1.38 } 1.39 @@ -196,7 +196,7 @@ 1.40 req.setAttribute("version", version.orElse(new Version(-1, selectedProject))); 1.41 req.setAttribute("versionStatusEnum", VersionStatus.values()); 1.42 1.43 - setDynamicFragment(req, "version-form"); 1.44 + setContentPage(req, "version-form"); 1.45 } 1.46 1.47 @RequestMapping(requestPath = "versions/edit", method = HttpMethod.GET) 1.48 @@ -231,7 +231,7 @@ 1.49 dao.getVersionDao().saveOrUpdate(version); 1.50 1.51 setRedirectLocation(req, "./projects/versions/"); 1.52 - setDynamicFragment(req, Constants.DYN_FRAGMENT_COMMIT_SUCCESSFUL); 1.53 + setContentPage(req, Constants.JSP_COMMIT_SUCCESSFUL); 1.54 LOG.debug("Successfully updated version {} for project {}", version.getName(), selectedProject.getName()); 1.55 } catch (NoSuchElementException | NumberFormatException | SQLException ex) { 1.56 // TODO: set request attribute with error text 1.57 @@ -250,7 +250,7 @@ 1.58 req.setAttribute("issueCategoryEnum", IssueCategory.values()); 1.59 req.setAttribute("versions", dao.getVersionDao().list(selectedProject)); 1.60 1.61 - setDynamicFragment(req, "issue-form"); 1.62 + setContentPage(req, "issue-form"); 1.63 } 1.64 1.65 @RequestMapping(requestPath = "issues/edit", method = HttpMethod.GET) 1.66 @@ -285,7 +285,7 @@ 1.67 dao.getIssueDao().saveOrUpdate(issue); 1.68 1.69 setRedirectLocation(req, "./projects/issues/"); 1.70 - setDynamicFragment(req, Constants.DYN_FRAGMENT_COMMIT_SUCCESSFUL); 1.71 + setContentPage(req, Constants.JSP_COMMIT_SUCCESSFUL); 1.72 LOG.debug("Successfully updated issue {} for project {}", issue.getId(), selectedProject.getName()); 1.73 } catch (NoSuchElementException | NumberFormatException | SQLException ex) { 1.74 // TODO: set request attribute with error text