The Unified and Autonomous Development Platform
Fix the issue that page navigation on some page does not work
robin shena505b3df855d
diff --git a/core/src/main/java/com/gitplex/server/manager/impl/DefaultMarkdownManager.java b/core/src/main/java/com/gitplex/server/manager/impl/DefaultMarkdownManager.javaindex bd044d39c8..3886ae7d28 100644--- a/core/src/main/java/com/gitplex/server/manager/impl/DefaultMarkdownManager.java+++ b/core/src/main/java/com/gitplex/server/manager/impl/DefaultMarkdownManager.java@@ -108,7 +108,7 @@ public class DefaultMarkdownManager implements MarkdownManager {.set(HtmlRenderer.GENERATE_HEADER_ID, true).set(AnchorLinkExtension.ANCHORLINKS_SET_NAME, true).set(AnchorLinkExtension.ANCHORLINKS_WRAP_TEXT, false)- .set(AnchorLinkExtension.ANCHORLINKS_TEXT_SUFFIX, "<i class='header-anchor fa fa-link'></i>")+ .set(AnchorLinkExtension.ANCHORLINKS_TEXT_PREFIX, "<span class='header-anchor'></span>").set(Parser.SPACE_IN_LINK_URLS, true).setFrom(ParserEmulationProfile.GITHUB_DOC).set(TablesExtension.COLUMN_SPANS, false)diff --git a/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentListPanel.java b/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentListPanel.javaindex a090e01167..a11ffc1038 100644--- a/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentListPanel.java+++ b/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentListPanel.java@@ -12,7 +12,6 @@ import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulatoimport org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;-import org.apache.wicket.extensions.markup.html.repeater.data.table.NavigationToolbar;import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;@@ -20,7 +19,6 @@ import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.navigation.paging.PagingNavigator;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.markup.repeater.Item;@@ -46,6 +44,7 @@ import com.gitplex.server.persistence.dao.EntityCriteria;import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.component.avatar.AvatarLink;+import com.gitplex.server.web.component.datatable.HistoryAwareNavToolbar;import com.gitplex.server.web.component.link.UserLink;import com.gitplex.server.web.component.markdown.ContentVersionSupport;import com.gitplex.server.web.component.markdown.MarkdownViewer;@@ -55,18 +54,21 @@ import com.gitplex.server.web.page.project.blob.ProjectBlobPage;import com.gitplex.server.web.page.project.compare.RevisionComparePage;import com.gitplex.server.web.page.project.pullrequest.requestdetail.changes.RequestChangesPage;import com.gitplex.server.web.util.DateUtils;--import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;+import com.gitplex.server.web.util.PagingHistorySupport;@SuppressWarnings("serial")public abstract class CodeCommentListPanel extends Panel {private final IModel<CodeCommentFilter> filterOptionModel;- public CodeCommentListPanel(String id, IModel<CodeCommentFilter> filterOptionModel) {+ private final PagingHistorySupport pagingHistorySupport;++ public CodeCommentListPanel(String id, IModel<CodeCommentFilter> filterOptionModel,+ PagingHistorySupport pagingHistorySupport) {super(id);this.filterOptionModel = filterOptionModel;+ this.pagingHistorySupport = pagingHistorySupport;}@Override@@ -286,15 +288,9 @@ public abstract class CodeCommentListPanel extends Panel {};DataTable<CodeComment, Void> dataTable = new DataTable<>("comments", columns,dataProvider, WebConstants.PAGE_SIZE);+ dataTable.setCurrentPage(pagingHistorySupport.getCurrentPage());dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable));- dataTable.addBottomToolbar(new NavigationToolbar(dataTable) {-- @Override- protected PagingNavigator newPagingNavigator(String navigatorId, DataTable<?, ?> table) {- return new BootstrapPagingNavigator(navigatorId, dataTable);- }-- });+ dataTable.addBottomToolbar(new HistoryAwareNavToolbar(dataTable, pagingHistorySupport));add(dataTable);}diff --git a/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.css b/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.cssindex 2c54c4fa8c..75678bfec3 100644--- a/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.css+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.css@@ -280,43 +280,51 @@ body.fullscreen {.markdown-rendered .task-list-item input {margin-right: 8px;}-.markdown-rendered .header-anchor {++.markdown-rendered .header-link {display: none;- position: relative;-}-.markdown-rendered h1:hover .header-anchor,-.markdown-rendered h2:hover .header-anchor,-.markdown-rendered h3:hover .header-anchor,-.markdown-rendered h4:hover .header-anchor,-.markdown-rendered h5:hover .header-anchor,-.markdown-rendered h6:hover .header-anchor {+ position: absolute;+ font-size: 24px;+ margin-left: -24px;+}+.markdown-rendered h1:hover .header-link,+.markdown-rendered h2:hover .header-link,+.markdown-rendered h3:hover .header-link,+.markdown-rendered h4:hover .header-link,+.markdown-rendered h5:hover .header-link,+.markdown-rendered h6:hover .header-link {display: inline;}-.markdown-rendered h1 .header-anchor {- margin-left: 12px;- font-size: 22px;++.markdown-rendered h1,+.markdown-rendered h2,+.markdown-rendered h3,+.markdown-rendered h4,+.markdown-rendered h5,+.markdown-rendered h6 {+ margin-left: -24px;+ padding-left: 24px;+ position: relative;+}+.markdown-rendered h1 .header-link {+ margin-top: 10px;}-.markdown-rendered h2 .header-anchor {- margin-left: 10px;- font-size: 20px;+.markdown-rendered h2 .header-link {+ margin-top: 6px;}-.markdown-rendered h3 .header-anchor {- margin-left: 10px;- font-size: 20px;+.markdown-rendered h3 .header-link {+ margin-top: 2px;}-.markdown-rendered h4 .header-anchor {- margin-left: 10px;- font-size: 14px;+.markdown-rendered h4 .header-link {+ margin-top: -2px;}-.markdown-rendered h5 .header-anchor {- margin-left: 4px;- font-size: 12px;+.markdown-rendered h5 .header-link {+ margin-top: -4px;}-.markdown-rendered h6 .header-anchor {- margin-left: 4px;- font-size: 12px;+.markdown-rendered h6 .header-link {+ margin-top: -6px;}-.markdown-rendered a.header-anchor {+.markdown-rendered a.header-link {color: #333;text-decoration: none;}diff --git a/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.js b/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.jsindex 93caa52f5f..b10f0bebe9 100644--- a/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.js+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.js@@ -804,10 +804,10 @@ gitplex.server.markdown = {initRendered: function($rendered) {gitplex.server.highlight($rendered);- $rendered.find(".header-anchor").each(function() {- var $headerAnchor = $(this).parent();- $headerAnchor.addClass("header-anchor");- $headerAnchor.closest("h1, h2, h3, h4, h5, h6").append($headerAnchor);+ $rendered.find("span.header-anchor").parent().addClass("header-anchor");+ $rendered.find("a.header-anchor").each(function() {+ var $headerAnchor = $(this);+ $headerAnchor.before("<a href='" + $headerAnchor.attr("href") + "' class='header-link'><i class='fa fa-link'></i></a>");});$rendered.find("a").click(function() {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 df91185bad..8be5eeb1a1 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@@ -289,7 +289,7 @@ public class GroupAuthorizationsPage extends GroupPage {@Overridepublic PageParameters newPageParameters(int currentPage) {- PageParameters params = new PageParameters();+ PageParameters params = paramsOf(getGroup());params.add(PARAM_PAGE, currentPage+1);return params;}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 fd2b413b87..bc27d30020 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@@ -211,7 +211,7 @@ public class GroupListPage extends LayoutPage {};- add(groupsTable = new HistoryAwareDataTable<Group, Void>("groups", columns, dataProvider,+ add(groupsTable = new HistoryAwareDataTable<>("groups", columns, dataProvider,WebConstants.PAGE_SIZE, pagingHistorySupport));}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 4d561ce795..b5ea6fd387 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@@ -253,7 +253,7 @@ public class GroupMembershipsPage extends GroupPage {@Overridepublic PageParameters newPageParameters(int currentPage) {- PageParameters params = new PageParameters();+ PageParameters params = paramsOf(getGroup());params.add(PARAM_PAGE, currentPage+1);return params;}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 9b940ecb37..6f2bd1b88a 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@@ -9,10 +9,13 @@ import com.gitplex.server.model.PullRequest;import com.gitplex.server.web.component.comment.CodeCommentFilter;import com.gitplex.server.web.component.comment.CodeCommentListPanel;import com.gitplex.server.web.page.project.ProjectPage;+import com.gitplex.server.web.util.PagingHistorySupport;@SuppressWarnings("serial")public class ProjectCodeCommentsPage extends ProjectPage {+ private static final String PARAM_PAGE = "page";+private final CodeCommentFilter filterOption;public ProjectCodeCommentsPage(PageParameters params) {@@ -43,6 +46,21 @@ public class ProjectCodeCommentsPage extends ProjectPage {setResponsePage(ProjectCodeCommentsPage.class, params);}+ }, new PagingHistorySupport() {++ @Override+ public PageParameters newPageParameters(int currentPage) {+ PageParameters params = paramsOf(getProject());+ filterOption.fillPageParams(params);+ params.add(PARAM_PAGE, currentPage+1);+ return params;+ }++ @Override+ public int getCurrentPage() {+ return getPageParameters().get(PARAM_PAGE).toInt(1)-1;+ }+}) {@Overridediff --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 2f7e959502..5f6f1fc73c 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@@ -14,10 +14,13 @@ import com.gitplex.server.security.SecurityUtils;import com.gitplex.server.web.component.comment.CodeCommentFilter;import com.gitplex.server.web.component.comment.CodeCommentListPanel;import com.gitplex.server.web.page.project.pullrequest.requestdetail.RequestDetailPage;+import com.gitplex.server.web.util.PagingHistorySupport;@SuppressWarnings("serial")public class RequestCodeCommentsPage extends RequestDetailPage {+ private static final String PARAM_PAGE = "page";+private final CodeCommentFilter filterOption;public RequestCodeCommentsPage(PageParameters params) {@@ -48,6 +51,21 @@ public class RequestCodeCommentsPage extends RequestDetailPage {setResponsePage(RequestCodeCommentsPage.class, params);}+ }, new PagingHistorySupport() {++ @Override+ public PageParameters newPageParameters(int currentPage) {+ PageParameters params = paramsOf(getPullRequest());+ filterOption.fillPageParams(params);+ params.add(PARAM_PAGE, currentPage+1);+ return params;+ }++ @Override+ public int getCurrentPage() {+ return getPageParameters().get(PARAM_PAGE).toInt(1)-1;+ }+}) {@Overridediff --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 a5c2dd9e2a..3990af7c7f 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@@ -12,7 +12,6 @@ import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulatoimport org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;-import org.apache.wicket.extensions.markup.html.repeater.data.table.NavigationToolbar;import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.head.CssHeaderItem;@@ -22,7 +21,6 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.link.AbstractLink;import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.navigation.paging.PagingNavigator;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.repeater.Item;import org.apache.wicket.markup.repeater.data.IDataProvider;@@ -40,6 +38,7 @@ import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.persistence.dao.EntityCriteria;import com.gitplex.server.web.WebConstants;import com.gitplex.server.web.component.avatar.AvatarLink;+import com.gitplex.server.web.component.datatable.HistoryAwareNavToolbar;import com.gitplex.server.web.component.floating.FloatingPanel;import com.gitplex.server.web.component.link.BranchLink;import com.gitplex.server.web.component.link.UserLink;@@ -53,12 +52,13 @@ import com.gitplex.server.web.page.project.pullrequest.newrequest.NewRequestPageimport com.gitplex.server.web.page.project.pullrequest.requestdetail.overview.RequestOverviewPage;import com.gitplex.server.web.page.project.pullrequest.requestlist.SearchOption.Status;import com.gitplex.server.web.util.DateUtils;--import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;+import com.gitplex.server.web.util.PagingHistorySupport;@SuppressWarnings("serial")public class RequestListPage extends ProjectPage {+ private static final String PARAM_PAGE = "page";+private static final Map<SortOption, String> sortNames = new LinkedHashMap<>();static {@@ -364,17 +364,29 @@ public class RequestListPage extends ProjectPage {}};- DataTable<PullRequest, Void> dataTable = new DataTable<>("requests", columns,- dataProvider, WebConstants.PAGE_SIZE);- dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable));- dataTable.addBottomToolbar(new NavigationToolbar(dataTable) {++ PagingHistorySupport pagingHistorySupport = new PagingHistorySupport() {++ @Override+ public PageParameters newPageParameters(int currentPage) {+ PageParameters params = paramsOf(getProject());+ searchOption.fillPageParams(params);+ params.add(PARAM_PAGE, currentPage+1);+ return params;+ }@Override- protected PagingNavigator newPagingNavigator(String navigatorId, DataTable<?, ?> table) {- return new BootstrapPagingNavigator(navigatorId, dataTable);+ public int getCurrentPage() {+ return getPageParameters().get(PARAM_PAGE).toInt(1)-1;}- });+ };++ DataTable<PullRequest, Void> dataTable = new DataTable<>("requests", columns,+ dataProvider, WebConstants.PAGE_SIZE);+ dataTable.setCurrentPage(pagingHistorySupport.getCurrentPage());+ dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable));+ dataTable.addBottomToolbar(new HistoryAwareNavToolbar(dataTable, pagingHistorySupport));add(dataTable);}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 5106aab243..4a39ddf9a4 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@@ -483,7 +483,7 @@ public class ProjectAuthorizationsPage extends ProjectSettingPage {@Overridepublic PageParameters newPageParameters(int currentPage) {- PageParameters params = new PageParameters();+ PageParameters params = paramsOf(getProject());params.add(PARAM_PAGE, currentPage+1);return params;}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 065d26f086..66f167d824 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@@ -143,7 +143,7 @@ public class TaskListPage extends UserPage {@Overridepublic PageParameters newPageParameters(int currentPage) {- PageParameters params = new PageParameters();+ PageParameters params = paramsOf(getUser());params.add(PARAM_PAGE, currentPage+1);return params;}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 0b4fd6821f..21e12d38c7 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@@ -470,7 +470,7 @@ public class UserAuthorizationsPage extends UserPage {@Overridepublic PageParameters newPageParameters(int currentPage) {- PageParameters params = new PageParameters();+ PageParameters params = paramsOf(getUser());params.add(PARAM_PAGE, currentPage+1);return params;}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 587a60ed4b..3cf7ab0339 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@@ -262,7 +262,7 @@ public class UserMembershipsPage extends UserPage {@Overridepublic PageParameters newPageParameters(int currentPage) {- PageParameters params = new PageParameters();+ PageParameters params = paramsOf(getUser());params.add(PARAM_PAGE, currentPage+1);return params;}