diff --git a/src/main/java/ru/ulstu/report/controller/ReportController.java b/src/main/java/ru/ulstu/report/controller/ReportController.java index 78eee25..43174e3 100644 --- a/src/main/java/ru/ulstu/report/controller/ReportController.java +++ b/src/main/java/ru/ulstu/report/controller/ReportController.java @@ -77,7 +77,7 @@ public class ReportController { model.addAttribute("pageNumbers", pageNumbers); } - model.addAttribute("report", new Report()); + model.addAttribute("report", new Report(0)); return "report/editReport"; } } diff --git a/src/main/java/ru/ulstu/report/model/Report.java b/src/main/java/ru/ulstu/report/model/Report.java index cc69be3..b1921a7 100644 --- a/src/main/java/ru/ulstu/report/model/Report.java +++ b/src/main/java/ru/ulstu/report/model/Report.java @@ -26,6 +26,10 @@ public class Report extends BaseEntity { @ManyToOne private Aspirant aspirant; + public Report(Integer id) { + setId(id); + } + public List<ReportValue> getValues() { return values; } diff --git a/src/main/resources/templates/report/editReport.html b/src/main/resources/templates/report/editReport.html index ba87a9a..8c84be8 100644 --- a/src/main/resources/templates/report/editReport.html +++ b/src/main/resources/templates/report/editReport.html @@ -105,7 +105,7 @@ </div> <div th:if="${indicators.totalPages > 0}" class="pagination" th:each="pageNumber : ${pageNumbers}"> - <a th:href="@{'/report/editReport/' + ${report.id}+'(size=${indicators.size}, page=${pageNumber})'}" + <a th:href="@{'/report/editReport/' + ${report.id}+'?size=' + ${indicators.size} + '&page='+${pageNumber}}" th:text=${pageNumber} th:class="${pageNumber == indicators.number+1} ? active"></a> </div>