Skip to content

The Unified and Autonomous Development Platform

Merge branch 'master' of https://code.onedev.io/projects/onedev-server

Robin Shen51d8d6219dab
diff --cc server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java
index 4b12a62b3d,67a3c591a5..f57338c9e0
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java
@@@ -130,12 -128,24 +130,12 @@@ public class MilestoneDetailPage extend
});
- PagingHistorySupport pagingHistorySupport = new PagingHistorySupport() {
-
- @Override
- public PageParameters newPageParameters(int currentPage) {
- PageParameters params = paramsOf(getMilestone(), query);
- params.add(PARAM_PAGE, currentPage+1);
- return params;
- }
-
- @Override
- public int getCurrentPage() {
- return getPageParameters().get(PARAM_PAGE).toInt(1)-1;
- }
-
- };
+ add(newIssueList());
+ }
+
+ private IssueListPanel newIssueList() {
+ return new IssueListPanel("issues", query) {
-
+
- add(new IssueListPanel("issues", query) {
-
@Override
protected IssueQuery getBaseQuery() {
return new IssueQuery(new MilestoneCriteria(getMilestone().getName()), new ArrayList<>());
@@@ -143,21 -153,7 +143,21 @@@
@Override
protected PagingHistorySupport getPagingHistorySupport() {
- return pagingHistorySupport;
+ return new PagingHistorySupport() {
+
+ @Override
+ public PageParameters newPageParameters(int currentPage) {
+ PageParameters params = paramsOf(getMilestone(), query);
- params.add(PARAM_CURRENT_PAGE, currentPage+1);
++ params.add(PARAM_PAGE, currentPage+1);
+ return params;
+ }
+
+ @Override
+ public int getCurrentPage() {
- return getPageParameters().get(PARAM_CURRENT_PAGE).toInt(1)-1;
++ return getPageParameters().get(PARAM_PAGE).toInt(1)-1;
+ }
+
+ };
}
@Override