#21 -- Fix pagination
This commit is contained in:
parent
7d40a52f19
commit
82823d6245
src/main
java/ru/ulstu/report
resources/templates/report
@ -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";
|
||||
}
|
||||
}
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -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>
|
||||
|
Loading…
x
Reference in New Issue
Block a user