The Unified and Autonomous Development Platform
Rename "page" param as "currentPage" to avoid conflict with select2 choice pages
robin shenee3438a3e4c3
diff --git a/web/src/main/java/com/gitplex/server/web/page/group/GroupAuthorizationsPage.java b/web/src/main/java/com/gitplex/server/web/page/group/GroupAuthorizationsPage.javaindex 8be5eeb1a1..beaf0c5215 100644--- a/web/src/main/java/com/gitplex/server/web/page/group/GroupAuthorizationsPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/group/GroupAuthorizationsPage.java@@ -62,7 +62,7 @@ import com.gitplex.server.web.util.PagingHistorySupport;@SuppressWarnings("serial")public class GroupAuthorizationsPage extends GroupPage {- private static final String PARAM_PAGE = "page";+ private static final String PARAM_CURRENT_PAGE = "currentPage";private String searchInput;@@ -290,13 +290,13 @@ public class GroupAuthorizationsPage extends GroupPage {@Overridepublic PageParameters newPageParameters(int currentPage) {PageParameters params = paramsOf(getGroup());- params.add(PARAM_PAGE, currentPage+1);+ params.add(PARAM_CURRENT_PAGE, currentPage+1);return params;}@Overridepublic int getCurrentPage() {- return getPageParameters().get(PARAM_PAGE).toInt(1)-1;+ return getPageParameters().get(PARAM_CURRENT_PAGE).toInt(1)-1;}};diff --git a/web/src/main/java/com/gitplex/server/web/page/group/GroupListPage.java b/web/src/main/java/com/gitplex/server/web/page/group/GroupListPage.javaindex bc27d30020..f94fc0e804 100644--- a/web/src/main/java/com/gitplex/server/web/page/group/GroupListPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/group/GroupListPage.java@@ -45,7 +45,7 @@ import com.gitplex.server.web.util.PagingHistorySupport;@SuppressWarnings("serial")public class GroupListPage extends LayoutPage {- private static final String PARAM_PAGE = "page";+ private static final String PARAM_CURRENT_PAGE = "currentPage";private DataTable<Group, Void> groupsTable;@@ -200,13 +200,13 @@ public class GroupListPage extends LayoutPage {@Overridepublic PageParameters newPageParameters(int currentPage) {PageParameters params = new PageParameters();- params.add(PARAM_PAGE, currentPage+1);+ params.add(PARAM_CURRENT_PAGE, currentPage+1);return params;}@Overridepublic int getCurrentPage() {- return getPageParameters().get(PARAM_PAGE).toInt(1)-1;+ return getPageParameters().get(PARAM_CURRENT_PAGE).toInt(1)-1;}};diff --git a/web/src/main/java/com/gitplex/server/web/page/group/GroupMembershipsPage.java b/web/src/main/java/com/gitplex/server/web/page/group/GroupMembershipsPage.javaindex b5ea6fd387..058cd7ee1f 100644--- a/web/src/main/java/com/gitplex/server/web/page/group/GroupMembershipsPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/group/GroupMembershipsPage.java@@ -57,7 +57,7 @@ import com.gitplex.server.web.util.PagingHistorySupport;@SuppressWarnings("serial")public class GroupMembershipsPage extends GroupPage {- private static final String PARAM_PAGE = "page";+ private static final String PARAM_CURRENT_PAGE = "currentPage";private String searchInput;@@ -254,13 +254,13 @@ public class GroupMembershipsPage extends GroupPage {@Overridepublic PageParameters newPageParameters(int currentPage) {PageParameters params = paramsOf(getGroup());- params.add(PARAM_PAGE, currentPage+1);+ params.add(PARAM_CURRENT_PAGE, currentPage+1);return params;}@Overridepublic int getCurrentPage() {- return getPageParameters().get(PARAM_PAGE).toInt(1)-1;+ return getPageParameters().get(PARAM_CURRENT_PAGE).toInt(1)-1;}};diff --git a/web/src/main/java/com/gitplex/server/web/page/project/ProjectListPage.java b/web/src/main/java/com/gitplex/server/web/page/project/ProjectListPage.javaindex 00e81406bf..66619f51b2 100644--- a/web/src/main/java/com/gitplex/server/web/page/project/ProjectListPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/ProjectListPage.java@@ -41,7 +41,7 @@ import com.gitplex.server.web.util.PagingHistorySupport;@SuppressWarnings("serial")public class ProjectListPage extends LayoutPage {- private static final String PARAM_PAGE = "page";+ private static final String PARAM_CURRENT_PAGE = "currentPage";private static final String PARAM_ORPHAN = "orphan";@@ -197,7 +197,7 @@ public class ProjectListPage extends LayoutPage {@Overridepublic PageParameters newPageParameters(int currentPage) {PageParameters params = new PageParameters();- params.add(PARAM_PAGE, currentPage+1);+ params.add(PARAM_CURRENT_PAGE, currentPage+1);if (showOrphanProjects)params.add(PARAM_ORPHAN, showOrphanProjects);return params;@@ -205,7 +205,7 @@ public class ProjectListPage extends LayoutPage {@Overridepublic int getCurrentPage() {- return getPageParameters().get(PARAM_PAGE).toInt(1)-1;+ return getPageParameters().get(PARAM_CURRENT_PAGE).toInt(1)-1;}}));diff --git a/web/src/main/java/com/gitplex/server/web/page/project/comments/ProjectCodeCommentsPage.java b/web/src/main/java/com/gitplex/server/web/page/project/comments/ProjectCodeCommentsPage.javaindex 6f2bd1b88a..60c4bd8787 100644--- a/web/src/main/java/com/gitplex/server/web/page/project/comments/ProjectCodeCommentsPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/comments/ProjectCodeCommentsPage.java@@ -14,7 +14,7 @@ import com.gitplex.server.web.util.PagingHistorySupport;@SuppressWarnings("serial")public class ProjectCodeCommentsPage extends ProjectPage {- private static final String PARAM_PAGE = "page";+ private static final String PARAM_CURRENT_PAGE = "currentPage";private final CodeCommentFilter filterOption;@@ -52,13 +52,13 @@ public class ProjectCodeCommentsPage extends ProjectPage {public PageParameters newPageParameters(int currentPage) {PageParameters params = paramsOf(getProject());filterOption.fillPageParams(params);- params.add(PARAM_PAGE, currentPage+1);+ params.add(PARAM_CURRENT_PAGE, currentPage+1);return params;}@Overridepublic int getCurrentPage() {- return getPageParameters().get(PARAM_PAGE).toInt(1)-1;+ return getPageParameters().get(PARAM_CURRENT_PAGE).toInt(1)-1;}}) {diff --git a/web/src/main/java/com/gitplex/server/web/page/project/commit/ProjectCommitsPage.java b/web/src/main/java/com/gitplex/server/web/page/project/commit/ProjectCommitsPage.javaindex e9158898c9..e57f3470c9 100644--- a/web/src/main/java/com/gitplex/server/web/page/project/commit/ProjectCommitsPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/commit/ProjectCommitsPage.java@@ -92,9 +92,9 @@ public class ProjectCommitsPage extends ProjectPage {private static final String PARAM_COMPARE_WITH = "compareWith";- private static final String PARAM_QUERY = "query";+ private static final String PARAM_COMMIT_QUERY = "commitQuery";- private static final String PARAM_PAGE = "page";+ private static final String PARAM_CURRENT_PAGE = "currentPage";private State state = new State();@@ -217,8 +217,8 @@ public class ProjectCommitsPage extends ProjectPage {super(params);state.compareWith = params.get(PARAM_COMPARE_WITH).toString();- state.query = params.get(PARAM_QUERY).toString();- Integer page = params.get(PARAM_PAGE).toOptionalInteger();+ state.query = params.get(PARAM_COMMIT_QUERY).toString();+ Integer page = params.get(PARAM_CURRENT_PAGE).toOptionalInteger();if (page != null)state.page = page.intValue();}@@ -531,9 +531,9 @@ public class ProjectCommitsPage extends ProjectPage {if (state.compareWith != null)params.set(PARAM_COMPARE_WITH, state.compareWith);if (state.query != null)- params.set(PARAM_QUERY, state.query);+ params.set(PARAM_COMMIT_QUERY, state.query);if (state.page != 1)- params.set(PARAM_PAGE, state.page);+ params.set(PARAM_CURRENT_PAGE, state.page);return params;}diff --git a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.java b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.javaindex 5f6f1fc73c..267f2666c9 100644--- a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.java@@ -19,7 +19,7 @@ import com.gitplex.server.web.util.PagingHistorySupport;@SuppressWarnings("serial")public class RequestCodeCommentsPage extends RequestDetailPage {- private static final String PARAM_PAGE = "page";+ private static final String PARAM_CURRENT_PAGE = "currentPage";private final CodeCommentFilter filterOption;@@ -57,13 +57,13 @@ public class RequestCodeCommentsPage extends RequestDetailPage {public PageParameters newPageParameters(int currentPage) {PageParameters params = paramsOf(getPullRequest());filterOption.fillPageParams(params);- params.add(PARAM_PAGE, currentPage+1);+ params.add(PARAM_CURRENT_PAGE, currentPage+1);return params;}@Overridepublic int getCurrentPage() {- return getPageParameters().get(PARAM_PAGE).toInt(1)-1;+ return getPageParameters().get(PARAM_CURRENT_PAGE).toInt(1)-1;}}) {diff --git a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestlist/RequestListPage.java b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestlist/RequestListPage.javaindex 3990af7c7f..71ab7c3f3a 100644--- a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestlist/RequestListPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestlist/RequestListPage.java@@ -57,7 +57,7 @@ import com.gitplex.server.web.util.PagingHistorySupport;@SuppressWarnings("serial")public class RequestListPage extends ProjectPage {- private static final String PARAM_PAGE = "page";+ private static final String PARAM_CURRENT_PAGE = "currentPage";private static final Map<SortOption, String> sortNames = new LinkedHashMap<>();@@ -371,13 +371,13 @@ public class RequestListPage extends ProjectPage {public PageParameters newPageParameters(int currentPage) {PageParameters params = paramsOf(getProject());searchOption.fillPageParams(params);- params.add(PARAM_PAGE, currentPage+1);+ params.add(PARAM_CURRENT_PAGE, currentPage+1);return params;}@Overridepublic int getCurrentPage() {- return getPageParameters().get(PARAM_PAGE).toInt(1)-1;+ return getPageParameters().get(PARAM_CURRENT_PAGE).toInt(1)-1;}};diff --git a/web/src/main/java/com/gitplex/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.java b/web/src/main/java/com/gitplex/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.javaindex 4a39ddf9a4..2145c091d8 100644--- a/web/src/main/java/com/gitplex/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.java@@ -72,7 +72,7 @@ import com.gitplex.server.web.util.PagingHistorySupport;@SuppressWarnings("serial")public class ProjectAuthorizationsPage extends ProjectSettingPage {- private static final String PARAM_PAGE = "page";+ private static final String PARAM_CURRENT_PAGE = "currentPage";private String searchInput;@@ -484,13 +484,13 @@ public class ProjectAuthorizationsPage extends ProjectSettingPage {@Overridepublic PageParameters newPageParameters(int currentPage) {PageParameters params = paramsOf(getProject());- params.add(PARAM_PAGE, currentPage+1);+ params.add(PARAM_CURRENT_PAGE, currentPage+1);return params;}@Overridepublic int getCurrentPage() {- return getPageParameters().get(PARAM_PAGE).toInt(1)-1;+ return getPageParameters().get(PARAM_CURRENT_PAGE).toInt(1)-1;}};diff --git a/web/src/main/java/com/gitplex/server/web/page/user/TaskListPage.java b/web/src/main/java/com/gitplex/server/web/page/user/TaskListPage.javaindex 66f167d824..4bf4b36af0 100644--- a/web/src/main/java/com/gitplex/server/web/page/user/TaskListPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/user/TaskListPage.java@@ -38,7 +38,7 @@ import com.gitplex.server.web.util.PagingHistorySupport;@SuppressWarnings("serial")public class TaskListPage extends UserPage {- private static final String PARAM_PAGE = "page";+ private static final String PARAM_CURRENT_PAGE = "currentPage";public TaskListPage(PageParameters params) {super(params);@@ -144,13 +144,13 @@ public class TaskListPage extends UserPage {@Overridepublic PageParameters newPageParameters(int currentPage) {PageParameters params = paramsOf(getUser());- params.add(PARAM_PAGE, currentPage+1);+ params.add(PARAM_CURRENT_PAGE, currentPage+1);return params;}@Overridepublic int getCurrentPage() {- return getPageParameters().get(PARAM_PAGE).toInt(1)-1;+ return getPageParameters().get(PARAM_CURRENT_PAGE).toInt(1)-1;}};diff --git a/web/src/main/java/com/gitplex/server/web/page/user/UserAuthorizationsPage.java b/web/src/main/java/com/gitplex/server/web/page/user/UserAuthorizationsPage.javaindex 21e12d38c7..d9c78a382c 100644--- a/web/src/main/java/com/gitplex/server/web/page/user/UserAuthorizationsPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/user/UserAuthorizationsPage.java@@ -68,7 +68,7 @@ import com.gitplex.server.web.util.PagingHistorySupport;@SuppressWarnings("serial")public class UserAuthorizationsPage extends UserPage {- private static final String PARAM_PAGE = "page";+ private static final String PARAM_CURRENT_PAGE = "currentPage";private String searchInput;@@ -471,13 +471,13 @@ public class UserAuthorizationsPage extends UserPage {@Overridepublic PageParameters newPageParameters(int currentPage) {PageParameters params = paramsOf(getUser());- params.add(PARAM_PAGE, currentPage+1);+ params.add(PARAM_CURRENT_PAGE, currentPage+1);return params;}@Overridepublic int getCurrentPage() {- return getPageParameters().get(PARAM_PAGE).toInt(1)-1;+ return getPageParameters().get(PARAM_CURRENT_PAGE).toInt(1)-1;}};diff --git a/web/src/main/java/com/gitplex/server/web/page/user/UserListPage.java b/web/src/main/java/com/gitplex/server/web/page/user/UserListPage.javaindex 8e3461cf35..95706d72b8 100644--- a/web/src/main/java/com/gitplex/server/web/page/user/UserListPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/user/UserListPage.java@@ -46,7 +46,7 @@ import com.gitplex.server.web.util.PagingHistorySupport;@SuppressWarnings("serial")public class UserListPage extends LayoutPage {- private static final String PARAM_PAGE = "page";+ private static final String PARAM_CURRENT_PAGE = "currentPage";private DataTable<User, Void> usersTable;@@ -194,13 +194,13 @@ public class UserListPage extends LayoutPage {@Overridepublic PageParameters newPageParameters(int currentPage) {PageParameters params = new PageParameters();- params.add(PARAM_PAGE, currentPage+1);+ params.add(PARAM_CURRENT_PAGE, currentPage+1);return params;}@Overridepublic int getCurrentPage() {- return getPageParameters().get(PARAM_PAGE).toInt(1)-1;+ return getPageParameters().get(PARAM_CURRENT_PAGE).toInt(1)-1;}};diff --git a/web/src/main/java/com/gitplex/server/web/page/user/UserMembershipsPage.java b/web/src/main/java/com/gitplex/server/web/page/user/UserMembershipsPage.javaindex 3cf7ab0339..fa91025edf 100644--- a/web/src/main/java/com/gitplex/server/web/page/user/UserMembershipsPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/user/UserMembershipsPage.java@@ -58,7 +58,7 @@ import com.gitplex.server.web.util.PagingHistorySupport;@SuppressWarnings("serial")public class UserMembershipsPage extends UserPage {- private static final String PARAM_PAGE = "page";+ private static final String PARAM_CURRENT_PAGE = "currentPage";private String searchInput;@@ -263,13 +263,13 @@ public class UserMembershipsPage extends UserPage {@Overridepublic PageParameters newPageParameters(int currentPage) {PageParameters params = paramsOf(getUser());- params.add(PARAM_PAGE, currentPage+1);+ params.add(PARAM_CURRENT_PAGE, currentPage+1);return params;}@Overridepublic int getCurrentPage() {- return getPageParameters().get(PARAM_PAGE).toInt(1)-1;+ return getPageParameters().get(PARAM_CURRENT_PAGE).toInt(1)-1;}};