Skip to content

The Unified and Autonomous Development Platform

fix issue #90: Do not show cursor info in build/issue/pull request url

Robin Shen99663507cb5b
diff --git a/server-core/src/main/java/io/onedev/server/util/markdown/BuildProcessor.java b/server-core/src/main/java/io/onedev/server/util/markdown/BuildProcessor.java
index 023f247b37..a53ee815d7 100644
--- a/server-core/src/main/java/io/onedev/server/util/markdown/BuildProcessor.java
+++ b/server-core/src/main/java/io/onedev/server/util/markdown/BuildProcessor.java
@@ -27,7 +27,7 @@ public class BuildProcessor extends ReferenceParser implements MarkdownProcessor
@Override
protected String toHtml(ProjectScopedNumber referenceable, String referenceText) {
CharSequence url = RequestCycle.get().urlFor(
- BuildDashboardPage.class, BuildDashboardPage.paramsOf(referenceable, null));
+ BuildDashboardPage.class, BuildDashboardPage.paramsOf(referenceable));
Build build = OneDev.getInstance(BuildManager.class).find(referenceable);
if (build != null && build.getVersion() != null)
referenceText += " (" + HtmlEscape.escapeHtml5(build.getVersion()) + ")";
diff --git a/server-core/src/main/java/io/onedev/server/util/markdown/IssueProcessor.java b/server-core/src/main/java/io/onedev/server/util/markdown/IssueProcessor.java
index c6490d7a8a..42e06d4d77 100644
--- a/server-core/src/main/java/io/onedev/server/util/markdown/IssueProcessor.java
+++ b/server-core/src/main/java/io/onedev/server/util/markdown/IssueProcessor.java
@@ -24,7 +24,7 @@ public class IssueProcessor extends ReferenceParser implements MarkdownProcessor
@Override
protected String toHtml(ProjectScopedNumber referenceable, String referenceText) {
CharSequence url = RequestCycle.get().urlFor(
- IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(referenceable, null));
+ IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(referenceable));
return String.format("<a href='%s' class='issue reference' data-reference='%s'>%s</a>",
url, referenceable.toString(), referenceText);
}
diff --git a/server-core/src/main/java/io/onedev/server/util/markdown/PullRequestProcessor.java b/server-core/src/main/java/io/onedev/server/util/markdown/PullRequestProcessor.java
index db28dd4761..95d83b210c 100644
--- a/server-core/src/main/java/io/onedev/server/util/markdown/PullRequestProcessor.java
+++ b/server-core/src/main/java/io/onedev/server/util/markdown/PullRequestProcessor.java
@@ -24,7 +24,7 @@ public class PullRequestProcessor extends ReferenceParser implements MarkdownPro
@Override
protected String toHtml(ProjectScopedNumber referenceable, String referenceText) {
CharSequence url = RequestCycle.get().urlFor(
- PullRequestActivitiesPage.class, PullRequestActivitiesPage.paramsOf(referenceable, null));
+ PullRequestActivitiesPage.class, PullRequestActivitiesPage.paramsOf(referenceable));
return String.format("<a href='%s' class='pull-request reference' data-reference='%s'>%s</a>",
url, referenceable.toString(), referenceText);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/WebSession.java b/server-core/src/main/java/io/onedev/server/web/WebSession.java
index 9c939464b0..08ea452c6c 100644
--- a/server-core/src/main/java/io/onedev/server/web/WebSession.java
+++ b/server-core/src/main/java/io/onedev/server/web/WebSession.java
@@ -1,5 +1,9 @@
package io.onedev.server.web;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import javax.annotation.Nullable;
import javax.servlet.http.HttpSession;
import org.apache.shiro.SecurityUtils;
@@ -9,11 +13,19 @@ import org.apache.wicket.protocol.http.WicketServlet;
import org.apache.wicket.request.Request;
import io.onedev.server.OneDev;
+import io.onedev.server.model.Project;
+import io.onedev.server.web.util.Cursor;
public class WebSession extends org.apache.wicket.protocol.http.WebSession {
private static final long serialVersionUID = 1L;
+
+ private final Map<Long, Cursor> issueCursors = new ConcurrentHashMap<>();
+ private final Map<Long, Cursor> buildCursors = new ConcurrentHashMap<>();
+
+ private final Map<Long, Cursor> pullRequestCursors = new ConcurrentHashMap<>();
+
public WebSession(Request request) {
super(request);
}
@@ -43,6 +55,42 @@ public class WebSession extends org.apache.wicket.protocol.http.WebSession {
session.replaceSession();
}
+ @Nullable
+ public Cursor getIssueCursor(Project project) {
+ return issueCursors.get(project.getId());
+ }
+
+ @Nullable
+ public Cursor getBuildCursor(Project project) {
+ return buildCursors.get(project.getId());
+ }
+
+ @Nullable
+ public Cursor getPullRequestCursor(Project project) {
+ return pullRequestCursors.get(project.getId());
+ }
+
+ public void setIssueCursor(Project project, @Nullable Cursor cursor) {
+ if (cursor != null)
+ issueCursors.put(project.getId(), cursor);
+ else
+ issueCursors.remove(project.getId());
+ }
+
+ public void setBuildCursor(Project project, @Nullable Cursor cursor) {
+ if (cursor != null)
+ buildCursors.put(project.getId(), cursor);
+ else
+ buildCursors.remove(project.getId());
+ }
+
+ public void setPullRequestCursor(Project project, @Nullable Cursor cursor) {
+ if (cursor != null)
+ pullRequestCursors.put(project.getId(), cursor);
+ else
+ pullRequestCursors.remove(project.getId());
+ }
+
public static WebSession from(HttpSession session) {
String attributeName = "wicket:" + OneDev.getInstance(WicketServlet.class).getServletName() + ":session";
return (WebSession) session.getAttribute(attributeName);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
index f8d0899df0..1b11bc2985 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
@@ -30,7 +30,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.form.TextField;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.html.panel.Panel;
@@ -69,6 +68,7 @@ import io.onedev.server.util.DateUtils;
import io.onedev.server.util.Input;
import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.WebConstants;
+import io.onedev.server.web.WebSession;
import io.onedev.server.web.behavior.BuildQueryBehavior;
import io.onedev.server.web.behavior.WebSocketObserver;
import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;
@@ -77,6 +77,7 @@ import io.onedev.server.web.component.build.status.BuildStatusIcon;
import io.onedev.server.web.component.datatable.DefaultDataTable;
import io.onedev.server.web.component.datatable.LoadableDetachableDataProvider;
import io.onedev.server.web.component.job.JobDefLink;
+import io.onedev.server.web.component.link.ActionablePageLink;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
@@ -85,8 +86,8 @@ import io.onedev.server.web.component.savedquery.SavedQueriesOpened;
import io.onedev.server.web.component.stringchoice.StringMultiChoice;
import io.onedev.server.web.page.project.builds.detail.dashboard.BuildDashboardPage;
import io.onedev.server.web.page.project.commits.CommitDetailPage;
-import io.onedev.server.web.util.PagingHistorySupport;
import io.onedev.server.web.util.Cursor;
+import io.onedev.server.web.util.PagingHistorySupport;
import io.onedev.server.web.util.QuerySaveSupport;
@SuppressWarnings("serial")
@@ -427,8 +428,15 @@ public abstract class BuildListPanel extends Panel {
Build build = rowModel.getObject();
Long buildId = build.getId();
- Link<Void> link = new BookmarkablePageLink<Void>("link", BuildDashboardPage.class,
- BuildDashboardPage.paramsOf(build, getCursor(cellItem)));
+ AjaxLink<Void> link = new ActionablePageLink<Void>("link",
+ BuildDashboardPage.class, BuildDashboardPage.paramsOf(build)) {
+
+ @Override
+ protected void doBeforeNav(AjaxRequestTarget target) {
+ WebSession.get().setBuildCursor(rowModel.getObject().getProject(), getCursor(cellItem));
+ }
+
+ };
link.add(new BuildStatusIcon("icon", new LoadableDetachableModel<Status>() {
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java
index 0f421dff0f..b99d97884c 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java
@@ -278,7 +278,7 @@ public abstract class BuildSidePanel extends Panel {
Link<Void> link = new ViewStateAwarePageLink<Void>("title",
PullRequestActivitiesPage.class,
- PullRequestActivitiesPage.paramsOf(request, null));
+ PullRequestActivitiesPage.paramsOf(request));
link.add(new Label("label", "#" + request.getNumber() + " " + request.getTitle()));
item.add(link);
item.add(new RequestStatusLabel("status", item.getModel()));
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/simplelist/SimpleBuildListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/simplelist/SimpleBuildListPanel.java
index c7a0f5e250..a32c6a50df 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/simplelist/SimpleBuildListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/simplelist/SimpleBuildListPanel.java
@@ -50,7 +50,7 @@ public class SimpleBuildListPanel extends GenericPanel<List<Build>> {
Build build = item.getModelObject();
Link<Void> buildLink = new BookmarkablePageLink<Void>("build",
- BuildDashboardPage.class, BuildDashboardPage.paramsOf(build, null));
+ BuildDashboardPage.class, BuildDashboardPage.paramsOf(build));
Long buildId = build.getId();
buildLink.add(new BuildStatusIcon("status", new LoadableDetachableModel<Status>() {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
index bd04809e1e..ad7a6b11d4 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
@@ -58,7 +58,6 @@ import io.onedev.server.web.component.savedquery.SavedQueriesClosed;
import io.onedev.server.web.component.savedquery.SavedQueriesOpened;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.page.project.compare.RevisionComparePage;
-import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPage;
import io.onedev.server.web.page.project.pullrequests.detail.changes.PullRequestChangesPage;
import io.onedev.server.web.util.PagingHistorySupport;
import io.onedev.server.web.util.QuerySaveSupport;
@@ -258,8 +257,7 @@ public abstract class CodeCommentListPanel extends Panel {
} else {
PullRequest request = getPullRequest();
if (request != null) {
- PullRequestDetailPage page = (PullRequestDetailPage) getPage();
- setResponsePage(PullRequestChangesPage.class, PullRequestChangesPage.paramsOf(request, page.getCursor(), comment));
+ setResponsePage(PullRequestChangesPage.class, PullRequestChangesPage.paramsOf(request, comment));
} else {
String compareCommit = comment.getCompareContext().getCompareCommit();
if (!compareCommit.equals(comment.getMarkPos().getCommit())
diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java
index 728e245e99..e99a9582b5 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java
@@ -62,10 +62,8 @@ import io.onedev.server.web.component.project.comment.CommentInput;
import io.onedev.server.web.component.user.ident.Mode;
import io.onedev.server.web.component.user.ident.UserIdentPanel;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
-import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPage;
import io.onedev.server.web.page.project.pullrequests.detail.changes.PullRequestChangesPage;
import io.onedev.server.web.util.ProjectAttachmentSupport;
-import io.onedev.server.web.util.Cursor;
@SuppressWarnings("serial")
public abstract class CodeCommentPanel extends Panel {
@@ -415,12 +413,7 @@ public abstract class CodeCommentPanel extends Panel {
Component outdatedLink;
if (getPullRequest() != null) {
- Cursor cursor;
- if (getPage() instanceof PullRequestDetailPage)
- cursor = ((PullRequestDetailPage)getPage()).getCursor();
- else
- cursor = null;
- PageParameters params = PullRequestChangesPage.paramsOf(getPullRequest(), cursor, getComment());
+ PageParameters params = PullRequestChangesPage.paramsOf(getPullRequest(), getComment());
add(outdatedLink = new BookmarkablePageLink<Void>("outdatedContext", PullRequestChangesPage.class, params) {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java
index 05045892a0..9b81a98718 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java
@@ -85,7 +85,7 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {
if (issue != null) {
Fragment linkFrag = new Fragment("value", "linkFrag", FieldValuesPanel.this);
Link<Void> link = new BookmarkablePageLink<Void>("link", IssueActivitiesPage.class,
- IssueActivitiesPage.paramsOf(issue, null));
+ IssueActivitiesPage.paramsOf(issue));
link.add(new Label("label", "#" + issue.getNumber()));
linkFrag.add(link);
item.add(linkFrag);
@@ -98,7 +98,7 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {
if (build != null) {
Fragment linkFrag = new Fragment("value", "linkFrag", FieldValuesPanel.this);
Link<Void> link = new BookmarkablePageLink<Void>("link",
- BuildDashboardPage.class, BuildDashboardPage.paramsOf(build, null));
+ BuildDashboardPage.class, BuildDashboardPage.paramsOf(build));
String buildInfo = "#" + build.getNumber();
if (build.getVersion() != null)
buildInfo += " (" + build.getVersion() + ")";
@@ -114,7 +114,7 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {
if (request != null && SecurityUtils.canReadCode(request.getTargetProject())) {
Fragment linkFrag = new Fragment("value", "linkFrag", FieldValuesPanel.this);
Link<Void> link = new BookmarkablePageLink<Void>("link", PullRequestActivitiesPage.class,
- PullRequestActivitiesPage.paramsOf(request, null));
+ PullRequestActivitiesPage.paramsOf(request));
link.add(new Label("label", "#" + request.getNumber()));
linkFrag.add(link);
item.add(linkFrag);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html
index e0d96f0a9c..3766b59115 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html
@@ -26,7 +26,7 @@
<wicket:fragment wicket:id="contentFrag">
<div class="primary clearfix">
<div class="pull-left">
- <span wicket:id="number" class="number"></span>
+ <a wicket:id="number" class="number"></a>
<span wicket:id="title" class="title"></span>
<a wicket:id="copy" title="Copy issue number and title" class="copy"><i class="fa fa-copy"></i></a>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
index 5fda8de551..c3609c3a54 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
@@ -28,6 +28,7 @@ import org.apache.wicket.feedback.FencedFeedbackPanel;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
@@ -66,6 +67,7 @@ import io.onedev.server.util.DateUtils;
import io.onedev.server.util.Input;
import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.WebConstants;
+import io.onedev.server.web.WebSession;
import io.onedev.server.web.behavior.IssueQueryBehavior;
import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;
import io.onedev.server.web.component.datatable.HistoryAwarePagingNavigator;
@@ -74,6 +76,7 @@ import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;
import io.onedev.server.web.component.floating.FloatingPanel;
import io.onedev.server.web.component.issue.IssueStateLabel;
import io.onedev.server.web.component.issue.fieldvalues.FieldValuesPanel;
+import io.onedev.server.web.component.link.ActionablePageLink;
import io.onedev.server.web.component.link.DropdownLink;
import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
@@ -85,8 +88,8 @@ import io.onedev.server.web.component.user.ident.Mode;
import io.onedev.server.web.component.user.ident.UserIdentPanel;
import io.onedev.server.web.page.project.issues.create.NewIssuePage;
import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;
-import io.onedev.server.web.util.PagingHistorySupport;
import io.onedev.server.web.util.Cursor;
+import io.onedev.server.web.util.PagingHistorySupport;
import io.onedev.server.web.util.QuerySaveSupport;
import io.onedev.server.web.util.ReferenceTransformer;
@@ -583,17 +586,47 @@ public abstract class IssueListPanel extends Panel {
cursor = null;
}
- String url = RequestCycle.get().urlFor(IssueActivitiesPage.class,
- IssueActivitiesPage.paramsOf(issue, cursor)).toString();
-
- String label = "#" + issue.getNumber();
+ String label;
if (getProject() == null)
- label = issue.getProject().getName() + label;
- fragment.add(new Label("number", "<a href='" + url + "'>" + label + "</a>")
- .setEscapeModelStrings(false));
+ label = issue.getProject().getName() + "#" + issue.getNumber();
+ else
+ label = "#" + issue.getNumber();
+ ActionablePageLink<Void> numberLink;
+ fragment.add(numberLink = new ActionablePageLink<Void>("number",
+ IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(issue)) {
+
+ @Override
+ public IModel<?> getBody() {
+ return Model.of(label);
+ }
+
+ @Override
+ protected void doBeforeNav(AjaxRequestTarget target) {
+ WebSession.get().setIssueCursor(rowModel.getObject().getProject(), cursor);
+ }
+
+ });
+
+ String url = RequestCycle.get().urlFor(IssueActivitiesPage.class,
+ IssueActivitiesPage.paramsOf(issue)).toString();
+
String transformed = new ReferenceTransformer(issue.getProject(), url).apply(issue.getTitle());
- fragment.add(new Label("title", transformed).setEscapeModelStrings(false));
+ fragment.add(new Label("title", transformed) {
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ String script = String.format(""
+ + "$('#%s a:not(.embedded-reference)').click(function() {"
+ + " $('#%s').click();"
+ + " return false;"
+ + "});",
+ getMarkupId(), numberLink.getMarkupId());
+ response.render(OnDomReadyHeaderItem.forScript(script));
+ }
+
+ }.setEscapeModelStrings(false).setOutputMarkupId(true));
fragment.add(new WebMarkupContainer("copy").add(
new CopyClipboardBehavior(Model.of("#" + issue.getNumber() + ": " + issue.getTitle()))));
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.css b/server-core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.css
index 279f463006..e87999a37f 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.css
@@ -26,13 +26,8 @@
.issue-list>.head>.operations>*:last-child {
margin-right: 0;
}
-.issue-list>.body td .number>a {
- margin-right: 12px;
-}
-.issue-list>.body td .title>a {
+.issue-list>.body td a.number, .issue-list>.body td .title>a {
margin-right: 4px;
-}
-.issue-list>.body td .number>a, .issue-list>.body td .title>a {
font-weight: bold;
font-size: 15px;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.java
index c51cb97be3..8d33510cf7 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.java
@@ -43,7 +43,7 @@ public class IssuePullRequestsPanel extends GenericPanel<Issue> {
PullRequest request = item.getModelObject();
Link<Void> link = new BookmarkablePageLink<Void>("title", PullRequestActivitiesPage.class,
- PullRequestActivitiesPage.paramsOf(request, null));
+ PullRequestActivitiesPage.paramsOf(request));
link.add(new Label("label", "#" + request.getNumber() + " - " + request.getTitle()));
item.add(link);
item.add(new RequestStatusLabel("status", item.getModel()));
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.java
index 3a442c056c..496e018061 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/referencedfrom/ReferencedFromIssuePanel.java
@@ -44,7 +44,7 @@ public class ReferencedFromIssuePanel extends GenericPanel<Issue> {
if (SecurityUtils.canAccess(issue.getProject())) {
String url = RequestCycle.get().urlFor(IssueActivitiesPage.class,
- IssueActivitiesPage.paramsOf(issue, null)).toString();
+ IssueActivitiesPage.paramsOf(issue)).toString();
ReferenceTransformer transformer = new ReferenceTransformer(issue.getProject(), url);
String transformed = transformer.apply(issue.getTitle());
String title;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java b/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java
index 99a0a158ff..bacb80dc12 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java
@@ -66,7 +66,7 @@ public abstract class RunJobLink extends AjaxLink<Void> {
job, bean, job.getParamSpecMap().keySet());
Build build = OneDev.getInstance(JobManager.class).submit(getProject(),
commitId, job.getName(), paramMap);
- setResponsePage(BuildDashboardPage.class, BuildDashboardPage.paramsOf(build, null));
+ setResponsePage(BuildDashboardPage.class, BuildDashboardPage.paramsOf(build));
}
@Override
@@ -88,7 +88,7 @@ public abstract class RunJobLink extends AjaxLink<Void> {
} else {
Build build = OneDev.getInstance(JobManager.class).submit(getProject(), commitId,
job.getName(), new HashMap<>());
- setResponsePage(BuildLogPage.class, BuildLogPage.paramsOf(build, null));
+ setResponsePage(BuildLogPage.class, BuildLogPage.paramsOf(build));
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/link/ActionablePageLink.java b/server-core/src/main/java/io/onedev/server/web/component/link/ActionablePageLink.java
new file mode 100644
index 0000000000..6eff3eb025
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/link/ActionablePageLink.java
@@ -0,0 +1,44 @@
+package io.onedev.server.web.component.link;
+
+import org.apache.wicket.Page;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+@SuppressWarnings("serial")
+public abstract class ActionablePageLink<T> extends AjaxLink<T> {
+
+ private final Class<? extends Page> pageClass;
+
+ private PageParameters params;
+
+ public ActionablePageLink(String id, Class<? extends Page> pageClass, PageParameters params) {
+ super(id);
+ this.pageClass = pageClass;
+ this.params = params;
+ }
+
+ public PageParameters getPageParams() {
+ return params;
+ }
+
+ public Class<? extends Page> getPageClass() {
+ return pageClass;
+ }
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ tag.put("href", RequestCycle.get().urlFor(pageClass, params));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ doBeforeNav(target);
+ setResponsePage(pageClass, params);
+ }
+
+ protected abstract void doBeforeNav(AjaxRequestTarget target);
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html
index 76daa18795..e3c9e8de35 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html
@@ -23,7 +23,7 @@
<wicket:fragment wicket:id="contentFrag">
<div class="primary clearfix">
<div class="pull-left">
- <span wicket:id="number" class="number"></span>
+ <a wicket:id="number" class="number"></a>
<span wicket:id="title" class="title"></span>
</div>
<div class="pull-right comments" title="Comments">
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
index da8cb26987..f9ef8c5c92 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
@@ -26,6 +26,7 @@ import org.apache.wicket.feedback.FencedFeedbackPanel;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
@@ -60,11 +61,13 @@ import io.onedev.server.security.permission.ReadCode;
import io.onedev.server.util.DateUtils;
import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.WebConstants;
+import io.onedev.server.web.WebSession;
import io.onedev.server.web.behavior.PullRequestQueryBehavior;
import io.onedev.server.web.component.branch.BranchLink;
import io.onedev.server.web.component.datatable.HistoryAwarePagingNavigator;
import io.onedev.server.web.component.datatable.LoadableDetachableDataProvider;
import io.onedev.server.web.component.floating.FloatingPanel;
+import io.onedev.server.web.component.link.ActionablePageLink;
import io.onedev.server.web.component.link.DropdownLink;
import io.onedev.server.web.component.project.selector.ProjectSelector;
import io.onedev.server.web.component.pullrequest.RequestStatusLabel;
@@ -74,8 +77,8 @@ import io.onedev.server.web.component.user.ident.Mode;
import io.onedev.server.web.component.user.ident.UserIdentPanel;
import io.onedev.server.web.page.project.pullrequests.create.NewPullRequestPage;
import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;
-import io.onedev.server.web.util.PagingHistorySupport;
import io.onedev.server.web.util.Cursor;
+import io.onedev.server.web.util.PagingHistorySupport;
import io.onedev.server.web.util.QuerySaveSupport;
import io.onedev.server.web.util.ReferenceTransformer;
@@ -298,16 +301,49 @@ public abstract class PullRequestListPanel extends Panel {
} else {
cursor = null;
}
-
+
+ String label;
+ if (getProject() == null)
+ label = request.getTargetProject().getName() + "#" + request.getNumber();
+ else
+ label = "#" + request.getNumber();
+
+ ActionablePageLink<Void> numberLink;
+ fragment.add(numberLink = new ActionablePageLink<Void>("number",
+ PullRequestActivitiesPage.class, PullRequestActivitiesPage.paramsOf(request)) {
+
+ @Override
+ public IModel<?> getBody() {
+ return Model.of(label);
+ }
+
+ @Override
+ protected void doBeforeNav(AjaxRequestTarget target) {
+ WebSession.get().setPullRequestCursor(rowModel.getObject().getTargetProject(), cursor);
+ }
+
+ });
+
String url = RequestCycle.get().urlFor(PullRequestActivitiesPage.class,
- PullRequestActivitiesPage.paramsOf(request, cursor)).toString();
+ PullRequestActivitiesPage.paramsOf(request)).toString();
- String label = "#" + request.getNumber();
- if (getProject() == null)
- label = request.getTargetProject().getName() + label;
- fragment.add(new Label("number", "<a href='" + url + "'>" + label + "</a>").setEscapeModelStrings(false));
ReferenceTransformer transformer = new ReferenceTransformer(request.getTargetProject(), url);
- fragment.add(new Label("title", transformer.apply(request.getTitle())).setEscapeModelStrings(false));
+
+ fragment.add(new Label("title", transformer.apply(request.getTitle())) {
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ String script = String.format(""
+ + "$('#%s a:not(.embedded-reference)').click(function() {"
+ + " $('#%s').click();"
+ + " return false;"
+ + "});",
+ getMarkupId(), numberLink.getMarkupId());
+ response.render(OnDomReadyHeaderItem.forScript(script));
+ }
+
+ }.setEscapeModelStrings(false).setOutputMarkupId(true));
fragment.add(new Label("comments", request.getCommentCount()));
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/pull-request-list.css b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/pull-request-list.css
index 01f5afdd17..c0149376a5 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/pull-request-list.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/pull-request-list.css
@@ -26,13 +26,8 @@
margin-right: 0;
}
-.pull-request-list>.body td .number>a {
- margin-right: 12px;
-}
-.pull-request-list>.body td .title>a {
+.pull-request-list>.body td a.number, .pull-request-list>.body td .title>a {
margin-right: 4px;
-}
-.pull-request-list>.body td .number>a, .pull-request-list>.body td .title>a {
font-weight: bold;
font-size: 15px;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/referencedfrom/ReferencedFromPullRequestPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/referencedfrom/ReferencedFromPullRequestPanel.java
index 4e0c5a1672..98f8360e57 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/referencedfrom/ReferencedFromPullRequestPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/referencedfrom/ReferencedFromPullRequestPanel.java
@@ -44,7 +44,7 @@ public class ReferencedFromPullRequestPanel extends GenericPanel<PullRequest> {
if (SecurityUtils.canReadCode(request.getTargetProject())) {
String url = RequestCycle.get().urlFor(PullRequestActivitiesPage.class,
- PullRequestActivitiesPage.paramsOf(request, null)).toString();
+ PullRequestActivitiesPage.paramsOf(request)).toString();
ReferenceTransformer transformer = new ReferenceTransformer(request.getTargetProject(), url);
String transformed = transformer.apply(request.getTitle());
String title;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java
index 37a139c182..0f34945c3a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java
@@ -659,7 +659,7 @@ public class ProjectBranchesPage extends ProjectPage {
WebMarkupContainer requestLink;
if (effectiveRequest != null && ab.getAhead() != 0) {
requestLink = new BookmarkablePageLink<Void>("effectiveRequest",
- PullRequestActivitiesPage.class, PullRequestActivitiesPage.paramsOf(effectiveRequest, null));
+ PullRequestActivitiesPage.class, PullRequestActivitiesPage.paramsOf(effectiveRequest));
if (effectiveRequest.isOpen()) {
requestLink.add(new Label("label", "Open"));
requestLink.add(AttributeAppender.append("title", "A pull request is open for this change"));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java
index ff315d3ff5..2bc2d56775 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java
@@ -8,7 +8,6 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.Callable;
-import javax.annotation.Nullable;
import javax.persistence.EntityNotFoundException;
import org.apache.commons.lang3.StringUtils;
@@ -46,6 +45,7 @@ import io.onedev.server.util.inputspec.InputContext;
import io.onedev.server.util.script.identity.JobIdentity;
import io.onedev.server.util.script.identity.ScriptIdentity;
import io.onedev.server.util.script.identity.ScriptIdentityAware;
+import io.onedev.server.web.WebSession;
import io.onedev.server.web.behavior.WebSocketObserver;
import io.onedev.server.web.component.beaneditmodal.BeanEditModalPanel;
import io.onedev.server.web.component.build.side.BuildSidePanel;
@@ -82,8 +82,6 @@ public abstract class BuildDetailPage extends ProjectPage
protected final IModel<Build> buildModel;
- private final Cursor cursor;
-
public BuildDetailPage(PageParameters params) {
super(params);
@@ -100,7 +98,7 @@ public abstract class BuildDetailPage extends ProjectPage
if (build == null)
throw new EntityNotFoundException("Unable to find build #" + buildNumber + " in project " + getProject());
else if (!build.getProject().equals(getProject()))
- throw new RestartResponseException(getPageClass(), paramsOf(build, cursor));
+ throw new RestartResponseException(getPageClass(), paramsOf(build));
else
return build;
}
@@ -109,8 +107,6 @@ public abstract class BuildDetailPage extends ProjectPage
if (!getBuild().isValid())
throw new RestartResponseException(InvalidBuildPage.class, InvalidBuildPage.paramsOf(getBuild()));
-
- cursor = Cursor.from(params);
}
@Override
@@ -192,7 +188,7 @@ public abstract class BuildDetailPage extends ProjectPage
Map<String, List<String>> paramMap = ParamSupply.getParamMap(getBuild().getJob(), paramBean,
getBuild().getJob().getParamSpecMap().keySet());
OneDev.getInstance(JobManager.class).resubmit(getBuild(), paramMap);
- setResponsePage(BuildDashboardPage.class, BuildDashboardPage.paramsOf(getBuild(), cursor));
+ setResponsePage(BuildDashboardPage.class, BuildDashboardPage.paramsOf(getBuild()));
}
@Override
@@ -339,7 +335,7 @@ public abstract class BuildDetailPage extends ProjectPage
@Override
protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {
return new ViewStateAwarePageLink<Void>(linkId, pageClass,
- FixedIssuesPage.paramsOf(getBuild(), getCursor(),
+ FixedIssuesPage.paramsOf(getBuild(),
getBuild().getJob().getDefaultFixedIssuesFilter()));
}
@@ -388,12 +384,15 @@ public abstract class BuildDetailPage extends ProjectPage
@Override
public Cursor getCursor() {
- return cursor;
+ return WebSession.get().getBuildCursor(getProject());
}
@Override
public void navTo(AjaxRequestTarget target, Build entity, Cursor cursor) {
- BuildDetailPage.this.navTo(target, entity, cursor);
+ WebSession.get().setBuildCursor(getProject(), cursor);
+ PageParameters params = getPageParameters();
+ params.set(PARAM_BUILD, entity.getNumber());
+ setResponsePage(getPageClass(), params);
}
};
@@ -406,9 +405,9 @@ public abstract class BuildDetailPage extends ProjectPage
@Override
public void onClick() {
OneDev.getInstance(BuildManager.class).delete(getBuild());
+ Cursor cursor = WebSession.get().getBuildCursor(getProject());
PageParameters params = ProjectBuildsPage.paramsOf(
- getProject(),
- Cursor.getQuery(cursor),
+ getProject(), Cursor.getQuery(cursor),
Cursor.getPage(cursor) + 1);
setResponsePage(ProjectBuildsPage.class, params);
}
@@ -426,10 +425,6 @@ public abstract class BuildDetailPage extends ProjectPage
}
- public Cursor getCursor() {
- return cursor;
- }
-
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
@@ -442,23 +437,16 @@ public abstract class BuildDetailPage extends ProjectPage
super.onDetach();
}
- public static PageParameters paramsOf(Build build, @Nullable Cursor cursor) {
- return paramsOf(build.getFQN(), cursor);
+ public static PageParameters paramsOf(Build build) {
+ return paramsOf(build.getFQN());
}
- public static PageParameters paramsOf(ProjectScopedNumber buildFQN, @Nullable Cursor cursor) {
+ public static PageParameters paramsOf(ProjectScopedNumber buildFQN) {
PageParameters params = ProjectPage.paramsOf(buildFQN.getProject());
params.add(PARAM_BUILD, buildFQN.getNumber());
- if (cursor != null)
- cursor.fill(params);
return params;
}
- protected void navTo(AjaxRequestTarget target, Build entity, Cursor cursor) {
- PageParameters params = BuildDetailPage.paramsOf(entity, cursor);
- setResponsePage(getPageClass(), params);
- }
-
@Override
public List<String> getInputNames() {
return new ArrayList<>(getBuild().getJob().getParamSpecMap().keySet());
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildTab.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildTab.java
index 5bd96c176f..57ef73e3ad 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildTab.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildTab.java
@@ -24,7 +24,7 @@ public class BuildTab extends PageTab {
protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {
BuildDetailPage page = (BuildDetailPage) getPage();
return new ViewStateAwarePageLink<Void>(linkId, pageClass,
- BuildDetailPage.paramsOf(page.getBuild(), page.getCursor()));
+ BuildDetailPage.paramsOf(page.getBuild()));
}
};
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/changes/BuildChangesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/changes/BuildChangesPage.java
index 53d8545851..bbd94efdd3 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/changes/BuildChangesPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/changes/BuildChangesPage.java
@@ -21,7 +21,6 @@ import io.onedev.server.search.commit.Revision;
import io.onedev.server.search.commit.RevisionCriteria;
import io.onedev.server.web.component.commit.list.CommitListPanel;
import io.onedev.server.web.page.project.builds.detail.BuildDetailPage;
-import io.onedev.server.web.util.Cursor;
@SuppressWarnings("serial")
public class BuildChangesPage extends BuildDetailPage {
@@ -63,7 +62,7 @@ public class BuildChangesPage extends BuildDetailPage {
@Override
protected void onQueryUpdated(AjaxRequestTarget target, String query) {
- CharSequence url = RequestCycle.get().urlFor(BuildChangesPage.class, paramsOf(getBuild(), getCursor(), query));
+ CharSequence url = RequestCycle.get().urlFor(BuildChangesPage.class, paramsOf(getBuild(), query));
BuildChangesPage.this.query = query;
pushState(target, url.toString(), query);
}
@@ -86,8 +85,8 @@ public class BuildChangesPage extends BuildDetailPage {
};
}
- public static PageParameters paramsOf(Build build, @Nullable Cursor cursor, @Nullable String query) {
- PageParameters params = paramsOf(build, cursor);
+ public static PageParameters paramsOf(Build build, @Nullable String query) {
+ PageParameters params = paramsOf(build);
if (query != null)
params.add(PARAM_QUERY, query);
return params;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/dashboard/BuildDashboardPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/dashboard/BuildDashboardPage.java
index c29900e440..b8984589ff 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/dashboard/BuildDashboardPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/dashboard/BuildDashboardPage.java
@@ -16,11 +16,11 @@ public class BuildDashboardPage extends BuildDetailPage {
super(params);
if (SecurityUtils.canAccessLog(getBuild()))
- throw new RestartResponseException(BuildLogPage.class, BuildLogPage.paramsOf(getBuild(), getCursor()));
+ throw new RestartResponseException(BuildLogPage.class, BuildLogPage.paramsOf(getBuild()));
else if (getBuild().getArtifactsDir().exists())
- throw new RestartResponseException(BuildArtifactsPage.class, BuildArtifactsPage.paramsOf(getBuild(), getCursor()));
+ throw new RestartResponseException(BuildArtifactsPage.class, BuildArtifactsPage.paramsOf(getBuild()));
else
- throw new RestartResponseException(FixedIssuesPage.class, FixedIssuesPage.paramsOf(getBuild(), getCursor()));
+ throw new RestartResponseException(FixedIssuesPage.class, FixedIssuesPage.paramsOf(getBuild()));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/issues/FixedIssuesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/issues/FixedIssuesPage.java
index fbc94ac25d..621b2e400c 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/issues/FixedIssuesPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/issues/FixedIssuesPage.java
@@ -17,7 +17,6 @@ import io.onedev.server.web.component.issue.list.IssueListPanel;
import io.onedev.server.web.page.project.builds.detail.BuildDetailPage;
import io.onedev.server.web.page.project.issues.list.ProjectIssueListPage;
import io.onedev.server.web.util.PagingHistorySupport;
-import io.onedev.server.web.util.Cursor;
@SuppressWarnings("serial")
public class FixedIssuesPage extends BuildDetailPage {
@@ -53,7 +52,7 @@ public class FixedIssuesPage extends BuildDetailPage {
@Override
public PageParameters newPageParameters(int currentPage) {
- PageParameters params = paramsOf(getBuild(), getCursor(), query);
+ PageParameters params = paramsOf(getBuild(), query);
params.add(PARAM_PAGE, currentPage+1);
return params;
}
@@ -68,7 +67,7 @@ public class FixedIssuesPage extends BuildDetailPage {
@Override
protected void onQueryUpdated(AjaxRequestTarget target, String query) {
- CharSequence url = RequestCycle.get().urlFor(ProjectIssueListPage.class, paramsOf(getBuild(), getCursor(), query));
+ CharSequence url = RequestCycle.get().urlFor(ProjectIssueListPage.class, paramsOf(getBuild(), query));
FixedIssuesPage.this.query = query;
pushState(target, url.toString(), query);
}
@@ -89,8 +88,8 @@ public class FixedIssuesPage extends BuildDetailPage {
target.add(listPanel);
}
- public static PageParameters paramsOf(Build build, @Nullable Cursor cursor, @Nullable String query) {
- PageParameters params = paramsOf(build, cursor);
+ public static PageParameters paramsOf(Build build, @Nullable String query) {
+ PageParameters params = paramsOf(build);
if (query != null)
params.add(PARAM_QUERY, query);
return params;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java
index b5e6635dce..fca1bac48d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java
@@ -446,7 +446,7 @@ public class RevisionComparePage extends ProjectPage implements CommentSupport,
@Override
public void onClick() {
- PageParameters params = PullRequestDetailPage.paramsOf(requestModel.getObject(), null);
+ PageParameters params = PullRequestDetailPage.paramsOf(requestModel.getObject());
setResponsePage(PullRequestActivitiesPage.class, params);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java
index 2a84c212ab..80fc597872 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java
@@ -15,6 +15,7 @@ import org.apache.wicket.markup.repeater.RepeatingView;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.model.Model;
import org.apache.wicket.request.cycle.RequestCycle;
import org.hibernate.Hibernate;
@@ -26,9 +27,11 @@ import io.onedev.server.model.Issue;
import io.onedev.server.model.User;
import io.onedev.server.util.Input;
import io.onedev.server.util.SecurityUtils;
+import io.onedev.server.web.WebSession;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
import io.onedev.server.web.component.issue.IssueStateLabel;
import io.onedev.server.web.component.issue.fieldvalues.FieldValuesPanel;
+import io.onedev.server.web.component.link.ActionablePageLink;
import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.component.user.avatar.UserAvatar;
@@ -185,15 +188,42 @@ abstract class BoardCardPanel extends GenericPanel<Issue> {
});
- String url = RequestCycle.get().urlFor(IssueActivitiesPage.class,
- IssueActivitiesPage.paramsOf(getIssue(), getCursor())).toString();
+ ActionablePageLink<Void> numberLink;
+ add(numberLink = new ActionablePageLink<Void>("number",
+ IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(getIssue())) {
+
+ @Override
+ public IModel<?> getBody() {
+ return Model.of("#" + getIssue().getNumber());
+ }
+
+ @Override
+ protected void doBeforeNav(AjaxRequestTarget target) {
+ WebSession.get().setIssueCursor(getIssue().getProject(), getCursor());
+ }
+
+ });
- add(new Label("number", "<a href='" + url + "'>#" + getIssue().getNumber() + "</a>")
- .setEscapeModelStrings(false));
+ String url = RequestCycle.get().urlFor(IssueActivitiesPage.class,
+ IssueActivitiesPage.paramsOf(getIssue())).toString();
ReferenceTransformer transformer = new ReferenceTransformer(getIssue().getProject(), url);
- add(new Label("title", transformer.apply(getIssue().getTitle()))
- .setEscapeModelStrings(false));
+
+ add(new Label("title", transformer.apply(getIssue().getTitle())) {
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ String script = String.format(""
+ + "$('#%s a:not(.embedded-reference)').click(function() {"
+ + " $('#%s').click();"
+ + " return false;"
+ + "});",
+ getMarkupId(), numberLink.getMarkupId());
+ response.render(OnDomReadyHeaderItem.forScript(script));
+ }
+
+ }.setEscapeModelStrings(false).setOutputMarkupId(true));
add(AttributeAppender.append("data-issue", getIssue().getId()));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java
index 8d3ed924a7..3d5b00189d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java
@@ -97,7 +97,7 @@ public class NewIssuePage extends ProjectPage implements InputContext, ScriptIde
super.onSubmit();
Issue issue = editor.getConvertedInput();
OneDev.getInstance(IssueManager.class).open(issue);
- setResponsePage(IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(issue, null));
+ setResponsePage(IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(issue));
}
};
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueBuildsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueBuildsPage.java
index 1bcd378e1a..c1652f952d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueBuildsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueBuildsPage.java
@@ -15,7 +15,6 @@ import io.onedev.server.search.entity.build.BuildQuery;
import io.onedev.server.search.entity.build.FixedIssueCriteria;
import io.onedev.server.web.component.build.list.BuildListPanel;
import io.onedev.server.web.util.PagingHistorySupport;
-import io.onedev.server.web.util.Cursor;
@SuppressWarnings("serial")
public class IssueBuildsPage extends IssueDetailPage {
@@ -51,7 +50,7 @@ public class IssueBuildsPage extends IssueDetailPage {
@Override
public PageParameters newPageParameters(int currentPage) {
- PageParameters params = paramsOf(getIssue(), getCursor(), query);
+ PageParameters params = paramsOf(getIssue(), query);
params.add(PARAM_PAGE, currentPage+1);
return params;
}
@@ -66,7 +65,7 @@ public class IssueBuildsPage extends IssueDetailPage {
@Override
protected void onQueryUpdated(AjaxRequestTarget target, String query) {
- CharSequence url = RequestCycle.get().urlFor(IssueBuildsPage.class, paramsOf(getIssue(), getCursor(), query));
+ CharSequence url = RequestCycle.get().urlFor(IssueBuildsPage.class, paramsOf(getIssue(), query));
IssueBuildsPage.this.query = query;
pushState(target, url.toString(), query);
}
@@ -87,8 +86,8 @@ public class IssueBuildsPage extends IssueDetailPage {
target.add(listPanel);
}
- public static PageParameters paramsOf(Issue issue, @Nullable Cursor cursor, @Nullable String query) {
- PageParameters params = paramsOf(issue, cursor);
+ public static PageParameters paramsOf(Issue issue, @Nullable String query) {
+ PageParameters params = paramsOf(issue);
if (query != null)
params.add(PARAM_QUERY, query);
return params;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java
index 56ae0cf609..475c48fd65 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java
@@ -3,7 +3,6 @@ package io.onedev.server.web.page.project.issues.detail;
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.Nullable;
import javax.persistence.EntityNotFoundException;
import org.apache.commons.lang3.StringUtils;
@@ -36,6 +35,7 @@ import io.onedev.server.util.inputspec.InputContext;
import io.onedev.server.util.script.identity.ScriptIdentity;
import io.onedev.server.util.script.identity.ScriptIdentityAware;
import io.onedev.server.util.script.identity.SiteAdministrator;
+import io.onedev.server.web.WebSession;
import io.onedev.server.web.component.issue.operation.IssueOperationsPanel;
import io.onedev.server.web.component.issue.side.IssueSidePanel;
import io.onedev.server.web.component.issue.title.IssueTitlePanel;
@@ -59,8 +59,6 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex
protected final IModel<Issue> issueModel;
- private final Cursor cursor;
-
public IssueDetailPage(PageParameters params) {
super(params);
@@ -77,14 +75,12 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex
if (issue == null)
throw new EntityNotFoundException("Unable to find issue #" + issueNumber + " in project " + getProject());
else if (!issue.getProject().equals(getProject()))
- throw new RestartResponseException(getPageClass(), paramsOf(issue, cursor));
+ throw new RestartResponseException(getPageClass(), paramsOf(issue));
else
return issue;
}
};
-
- cursor = Cursor.from(params);
}
public Issue getIssue() {
@@ -161,13 +157,13 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex
@Override
public Cursor getCursor() {
- return cursor;
+ return WebSession.get().getIssueCursor(getProject());
}
@Override
public void navTo(AjaxRequestTarget target, Issue entity, Cursor cursor) {
- PageParameters params = IssueDetailPage.paramsOf(entity, cursor);
- setResponsePage(getPageClass(), params);
+ WebSession.get().setIssueCursor(getProject(), cursor);
+ setResponsePage(getPageClass(), paramsOf(entity));
}
};
@@ -180,6 +176,7 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex
@Override
public void onClick() {
OneDev.getInstance(IssueManager.class).delete(getIssue());
+ Cursor cursor = WebSession.get().getIssueCursor(getProject());
PageParameters params = ProjectIssueListPage.paramsOf(
getProject(),
Cursor.getQuery(cursor),
@@ -243,10 +240,6 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex
}
- public Cursor getCursor() {
- return cursor;
- }
-
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
@@ -260,15 +253,13 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex
super.onDetach();
}
- public static PageParameters paramsOf(Issue issue, @Nullable Cursor cursor) {
- return paramsOf(issue.getFQN(), cursor);
+ public static PageParameters paramsOf(Issue issue) {
+ return paramsOf(issue.getFQN());
}
- public static PageParameters paramsOf(ProjectScopedNumber issueFQN, @Nullable Cursor cursor) {
+ public static PageParameters paramsOf(ProjectScopedNumber issueFQN) {
PageParameters params = ProjectPage.paramsOf(issueFQN.getProject());
params.add(PARAM_ISSUE, issueFQN.getNumber());
- if (cursor != null)
- cursor.fill(params);
return params;
}
@@ -299,7 +290,7 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex
@Override
protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {
- return new ViewStateAwarePageLink<Void>(linkId, pageClass, paramsOf(getIssue(), cursor));
+ return new ViewStateAwarePageLink<Void>(linkId, pageClass, paramsOf(getIssue()));
}
};
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
index 7f2c32b69a..0e18e825f3 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
@@ -530,7 +530,7 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {
@Override
public void onClick() {
- PageParameters params = PullRequestDetailPage.paramsOf(getPullRequest(), null);
+ PageParameters params = PullRequestDetailPage.paramsOf(getPullRequest());
setResponsePage(PullRequestActivitiesPage.class, params);
}
@@ -599,7 +599,7 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {
OneDev.getInstance(PullRequestManager.class).open(getPullRequest());
- setResponsePage(PullRequestActivitiesPage.class, PullRequestActivitiesPage.paramsOf(getPullRequest(), null));
+ setResponsePage(PullRequestActivitiesPage.class, PullRequestActivitiesPage.paramsOf(getPullRequest()));
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
index 9424977aa8..249627b829 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
@@ -26,7 +26,6 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import javax.annotation.Nullable;
import javax.persistence.EntityNotFoundException;
import org.apache.commons.lang3.StringUtils;
@@ -104,6 +103,7 @@ import io.onedev.server.util.DateUtils;
import io.onedev.server.util.ProjectAndBranch;
import io.onedev.server.util.ProjectScopedNumber;
import io.onedev.server.util.SecurityUtils;
+import io.onedev.server.web.WebSession;
import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
import io.onedev.server.web.behavior.ReferenceInputBehavior;
import io.onedev.server.web.behavior.WebSocketObserver;
@@ -136,10 +136,10 @@ import io.onedev.server.web.page.project.pullrequests.detail.changes.PullRequest
import io.onedev.server.web.page.project.pullrequests.detail.codecomments.PullRequestCodeCommentsPage;
import io.onedev.server.web.page.project.pullrequests.detail.mergepreview.MergePreviewPage;
import io.onedev.server.web.util.ConfirmOnClick;
-import io.onedev.server.web.util.ProjectAttachmentSupport;
-import io.onedev.server.web.util.PullRequestAware;
import io.onedev.server.web.util.Cursor;
import io.onedev.server.web.util.CursorSupport;
+import io.onedev.server.web.util.ProjectAttachmentSupport;
+import io.onedev.server.web.util.PullRequestAware;
import io.onedev.server.web.util.ReferenceTransformer;
import io.onedev.server.web.util.WicketUtils;
@@ -152,8 +152,6 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
protected final IModel<PullRequest> requestModel;
- private final Cursor cursor;
-
private boolean isEditingTitle;
private String title;
@@ -180,7 +178,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
if (request == null)
throw new EntityNotFoundException("Unable to find pull request #" + requestNumber + " in project " + getProject());
else if (!request.getTargetProject().equals(getProject()))
- throw new RestartResponseException(getPageClass(), paramsOf(request, cursor));
+ throw new RestartResponseException(getPageClass(), paramsOf(request));
else
return request;
}
@@ -191,8 +189,6 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
throw new RestartResponseException(InvalidPullRequestPage.class, InvalidPullRequestPage.paramsOf(getPullRequest()));
reviewUpdateId = requestModel.getObject().getLatestUpdate().getId();
-
- cursor = Cursor.from(params);
}
private PullRequestManager getPullRequestManager() {
@@ -490,13 +486,13 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
@Override
public Cursor getCursor() {
- return cursor;
+ return WebSession.get().getPullRequestCursor(getProject());
}
@Override
public void navTo(AjaxRequestTarget target, PullRequest entity, Cursor cursor) {
- PageParameters params = PullRequestDetailPage.paramsOf(entity, cursor);
- setResponsePage(getPageClass(), params);
+ WebSession.get().setPullRequestCursor(getProject(), cursor);
+ setResponsePage(getPageClass(), paramsOf(entity));
}
};
@@ -681,6 +677,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
PullRequest request = getPullRequest();
getPullRequestManager().delete(request);
Session.get().success("Pull request #" + request.getNumber() + " is deleted");
+ Cursor cursor = WebSession.get().getPullRequestCursor(getProject());
PageParameters params = ProjectPullRequestsPage.paramsOf(
getProject(),
Cursor.getQuery(cursor),
@@ -1146,7 +1143,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
} else {
try {
operation.operate(request, noteInput.getModelObject());
- setResponsePage(PullRequestActivitiesPage.class, PullRequestActivitiesPage.paramsOf(getPullRequest(), cursor));
+ setResponsePage(PullRequestActivitiesPage.class, PullRequestActivitiesPage.paramsOf(getPullRequest()));
} catch (OneException e) {
error(e.getMessage());
target.add(feedback);
@@ -1268,15 +1265,13 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
super.onDetach();
}
- public static PageParameters paramsOf(PullRequest request, @Nullable Cursor cursor) {
- return paramsOf(request.getFQN(), cursor);
+ public static PageParameters paramsOf(PullRequest request) {
+ return paramsOf(request.getFQN());
}
- public static PageParameters paramsOf(ProjectScopedNumber requestFQN, @Nullable Cursor cursor) {
+ public static PageParameters paramsOf(ProjectScopedNumber requestFQN) {
PageParameters params = ProjectPage.paramsOf(requestFQN.getProject());
params.add(PARAM_REQUEST, requestFQN.getNumber());
- if (cursor != null)
- cursor.fill(params);
return params;
}
@@ -1285,10 +1280,6 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
return requestModel.getObject();
}
- public Cursor getCursor() {
- return cursor;
- }
-
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
@@ -1313,7 +1304,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
if (getMainPageClass() == PullRequestCodeCommentsPage.class) {
Fragment fragment = new Fragment(componentId, "codeCommentsTabLinkFrag", PullRequestDetailPage.this);
Link<Void> link = new ViewStateAwarePageLink<Void>("link",
- PullRequestCodeCommentsPage.class, paramsOf(getPullRequest(), cursor));
+ PullRequestCodeCommentsPage.class, paramsOf(getPullRequest()));
link.add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {
@Override
@@ -1349,7 +1340,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
@Override
protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {
- return new ViewStateAwarePageLink<Void>(linkId, pageClass, paramsOf(getPullRequest(), cursor));
+ return new ViewStateAwarePageLink<Void>(linkId, pageClass, paramsOf(getPullRequest()));
}
};
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/UnreviewedChangesPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/UnreviewedChangesPanel.java
index 9097db72bd..b5b02fc8b6 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/UnreviewedChangesPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/UnreviewedChangesPanel.java
@@ -24,9 +24,8 @@ public class UnreviewedChangesPanel extends GenericPanel<PullRequestUpdate> {
state.oldCommit = update.getHeadCommitHash();
state.newCommit = update.getRequest().getHeadCommitHash();
- PullRequestDetailPage page = (PullRequestDetailPage) getPage();
add(new ViewStateAwarePageLink<Void>("link", PullRequestChangesPage.class,
- PullRequestChangesPage.paramsOf(update.getRequest(), page.getCursor(), state)));
+ PullRequestChangesPage.paramsOf(update.getRequest(), state)));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/UpdateChangesLink.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/UpdateChangesLink.java
index e2869489fb..863375f918 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/UpdateChangesLink.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/UpdateChangesLink.java
@@ -1,7 +1,5 @@
package io.onedev.server.web.page.project.pullrequests.detail;
-import javax.annotation.Nullable;
-
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -9,19 +7,19 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.model.PullRequestUpdate;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.page.project.pullrequests.detail.changes.PullRequestChangesPage;
-import io.onedev.server.web.util.Cursor;
@SuppressWarnings("serial")
public class UpdateChangesLink extends ViewStateAwarePageLink<Void> {
- public UpdateChangesLink(String id, PullRequestUpdate update, @Nullable Cursor cursor) {
- super(id, PullRequestChangesPage.class, paramsOf(update, cursor));
+ public UpdateChangesLink(String id, PullRequestUpdate update) {
+ super(id, PullRequestChangesPage.class, paramsOf(update));
setEscapeModelStrings(false);
}
- private static PageParameters paramsOf(PullRequestUpdate update, @Nullable Cursor cursor) {
- return PullRequestChangesPage.paramsOf(update.getRequest(), cursor, update.getBaseCommitHash(), update.getHeadCommitHash());
+ private static PageParameters paramsOf(PullRequestUpdate update) {
+ return PullRequestChangesPage.paramsOf(update.getRequest(),
+ update.getBaseCommitHash(), update.getHeadCommitHash());
}
public IModel<?> getBody() {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/SinceChangesLink.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/SinceChangesLink.java
index 2b686949f3..d0a32ab7a1 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/SinceChangesLink.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/SinceChangesLink.java
@@ -14,7 +14,6 @@ import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestUpdate;
import io.onedev.server.web.behavior.WebSocketObserver;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
-import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPage;
import io.onedev.server.web.page.project.pullrequests.detail.changes.PullRequestChangesPage;
@SuppressWarnings("serial")
@@ -51,8 +50,7 @@ public class SinceChangesLink extends ViewStateAwarePageLink<Void> {
PullRequestChangesPage.State state = new PullRequestChangesPage.State();
state.oldCommit = oldCommitModel.getObject();
state.newCommit = request.getHeadCommitHash();
- PullRequestDetailPage page = (PullRequestDetailPage) getPage();
- return PullRequestChangesPage.paramsOf(request, page.getCursor(), state);
+ return PullRequestChangesPage.paramsOf(request, state);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java
index 3773f90127..81aaf5d5e0 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java
@@ -49,7 +49,6 @@ import io.onedev.server.web.component.floating.FloatingPanel;
import io.onedev.server.web.component.link.DropdownLink;
import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPage;
import io.onedev.server.web.util.EditParamsAware;
-import io.onedev.server.web.util.Cursor;
import io.onedev.server.web.websocket.WebSocketManager;
@SuppressWarnings("serial")
@@ -356,11 +355,11 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Com
super.onDetach();
}
- public static PageParameters paramsOf(PullRequest request, @Nullable Cursor cursor, String oldCommit, String newCommit) {
+ public static PageParameters paramsOf(PullRequest request, String oldCommit, String newCommit) {
State state = new State();
state.oldCommit = oldCommit;
state.newCommit = newCommit;
- return paramsOf(request, cursor, state);
+ return paramsOf(request, state);
}
public static State getState(CodeComment comment) {
@@ -372,12 +371,12 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Com
return state;
}
- public static PageParameters paramsOf(PullRequest request, @Nullable Cursor cursor, CodeComment comment) {
- return paramsOf(request, cursor, getState(comment));
+ public static PageParameters paramsOf(PullRequest request, CodeComment comment) {
+ return paramsOf(request, getState(comment));
}
- public static PageParameters paramsOf(PullRequest request, @Nullable Cursor cursor, State state) {
- PageParameters params = PullRequestDetailPage.paramsOf(request, cursor);
+ public static PageParameters paramsOf(PullRequest request, State state) {
+ PageParameters params = PullRequestDetailPage.paramsOf(request);
fillParams(params, state);
return params;
}
@@ -409,7 +408,7 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Com
}
private void pushState(IPartialPageRequestHandler partialPageRequestHandler) {
- PageParameters params = paramsOf(getPullRequest(), getCursor(), state);
+ PageParameters params = paramsOf(getPullRequest(), state);
CharSequence url = RequestCycle.get().urlFor(PullRequestChangesPage.class, params);
pushState(partialPageRequestHandler, url.toString(), state);
}
@@ -501,7 +500,7 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Com
markState.newCommit = state.newCommit;
markState.pathFilter = state.pathFilter;
markState.whitespaceOption = state.whitespaceOption;
- return urlFor(PullRequestChangesPage.class, paramsOf(getPullRequest(), getCursor(), markState)).toString();
+ return urlFor(PullRequestChangesPage.class, paramsOf(getPullRequest(), markState)).toString();
}
@Override
@@ -513,7 +512,7 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Com
commentState.newCommit = state.newCommit;
commentState.pathFilter = state.pathFilter;
commentState.whitespaceOption = state.whitespaceOption;
- return urlFor(PullRequestChangesPage.class, paramsOf(getPullRequest(), getCursor(), commentState)).toString();
+ return urlFor(PullRequestChangesPage.class, paramsOf(getPullRequest(), commentState)).toString();
}
@Override
@@ -557,7 +556,7 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Com
@Override
public PageParameters getParamsBeforeEdit() {
- return paramsOf(getPullRequest(), getCursor(), state);
+ return paramsOf(getPullRequest(), state);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/codecomments/PullRequestCodeCommentsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/codecomments/PullRequestCodeCommentsPage.java
index 990a2b92e0..04624ed466 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/codecomments/PullRequestCodeCommentsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/codecomments/PullRequestCodeCommentsPage.java
@@ -17,7 +17,6 @@ import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.component.codecomment.CodeCommentListPanel;
import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPage;
import io.onedev.server.web.util.PagingHistorySupport;
-import io.onedev.server.web.util.Cursor;
@SuppressWarnings("serial")
public class PullRequestCodeCommentsPage extends PullRequestDetailPage {
@@ -47,7 +46,7 @@ public class PullRequestCodeCommentsPage extends PullRequestDetailPage {
@Override
public PageParameters newPageParameters(int currentPage) {
- PageParameters params = paramsOf(getPullRequest(), getCursor(), query);
+ PageParameters params = paramsOf(getPullRequest(), query);
params.add(PARAM_PAGE, currentPage+1);
return params;
}
@@ -73,7 +72,7 @@ public class PullRequestCodeCommentsPage extends PullRequestDetailPage {
@Override
protected void onQueryUpdated(AjaxRequestTarget target, String query) {
- PageParameters params = paramsOf(getPullRequest(), getCursor(), query);
+ PageParameters params = paramsOf(getPullRequest(), query);
setResponsePage(PullRequestCodeCommentsPage.class, params);
}
@@ -129,8 +128,8 @@ public class PullRequestCodeCommentsPage extends PullRequestDetailPage {
});
}
- public static PageParameters paramsOf(PullRequest request, @Nullable Cursor cursor, @Nullable String query) {
- PageParameters params = paramsOf(request, cursor);
+ public static PageParameters paramsOf(PullRequest request, @Nullable String query) {
+ PageParameters params = paramsOf(request);
if (query != null)
params.add(PARAM_QUERY, query);
return params;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.java
index 3dc36530d7..b00c97b181 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.java
@@ -36,7 +36,6 @@ import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.page.project.commits.CommitDetailPage;
import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPage;
import io.onedev.server.web.util.EditParamsAware;
-import io.onedev.server.web.util.Cursor;
@SuppressWarnings("serial")
public class MergePreviewPage extends PullRequestDetailPage implements EditParamsAware {
@@ -69,8 +68,8 @@ public class MergePreviewPage extends PullRequestDetailPage implements EditParam
newContent(null);
}
- public static PageParameters paramsOf(PullRequest request, @Nullable Cursor cursor, State state) {
- PageParameters params = PullRequestDetailPage.paramsOf(request, cursor);
+ public static PageParameters paramsOf(PullRequest request, State state) {
+ PageParameters params = PullRequestDetailPage.paramsOf(request);
if (state.whitespaceOption != WhitespaceOption.DEFAULT)
params.set(PARAM_WHITESPACE_OPTION, state.whitespaceOption.name());
@@ -259,7 +258,7 @@ public class MergePreviewPage extends PullRequestDetailPage implements EditParam
}
private void pushState(IPartialPageRequestHandler partialPageRequestHandler) {
- PageParameters params = paramsOf(getPullRequest(), getCursor(), state);
+ PageParameters params = paramsOf(getPullRequest(), state);
CharSequence url = RequestCycle.get().urlFor(MergePreviewPage.class, params);
pushState(partialPageRequestHandler, url.toString(), state);
}
@@ -272,12 +271,12 @@ public class MergePreviewPage extends PullRequestDetailPage implements EditParam
@Override
public PageParameters getParamsBeforeEdit() {
- return paramsOf(getPullRequest(), getCursor(), state);
+ return paramsOf(getPullRequest(), state);
}
@Override
public PageParameters getParamsAfterEdit() {
- return paramsOf(getPullRequest(), getCursor(), state);
+ return paramsOf(getPullRequest(), state);
}
public static class State implements Serializable {
diff --git a/server-core/src/main/java/io/onedev/server/web/util/Cursor.java b/server-core/src/main/java/io/onedev/server/web/util/Cursor.java
index 72eb945f11..7034aa183b 100644
--- a/server-core/src/main/java/io/onedev/server/web/util/Cursor.java
+++ b/server-core/src/main/java/io/onedev/server/web/util/Cursor.java
@@ -4,17 +4,12 @@ import java.io.Serializable;
import javax.annotation.Nullable;
-import org.apache.commons.lang.StringUtils;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
import io.onedev.server.web.WebConstants;
public class Cursor implements Serializable {
private static final long serialVersionUID = 1L;
- public static String PARAM = "cursor";
-
private final String query;
private final int count;
@@ -39,24 +34,6 @@ public class Cursor implements Serializable {
return count;
}
- public void fill(PageParameters params) {
- params.add(PARAM, query + ":" + count + ":" + offset);
- }
-
- @Nullable
- public static Cursor from(PageParameters params) {
- String cursorStr = params.get(PARAM).toOptionalString();
- if (cursorStr != null) {
- String tempStr = StringUtils.substringBeforeLast(cursorStr, ":");
- int offset = Integer.parseInt(StringUtils.substringAfterLast(cursorStr, ":"));
- int count = Integer.parseInt(StringUtils.substringAfterLast(tempStr, ":"));
- String query = StringUtils.substringBeforeLast(tempStr, ":");
- return new Cursor(query, count, offset);
- } else {
- return null;
- }
- }
-
@Nullable
public static String getQuery(@Nullable Cursor cursor) {
if (cursor != null)
diff --git a/server-core/src/main/java/io/onedev/server/web/util/ReferenceTransformer.java b/server-core/src/main/java/io/onedev/server/web/util/ReferenceTransformer.java
index bc8df787c3..e8555897f8 100644
--- a/server-core/src/main/java/io/onedev/server/web/util/ReferenceTransformer.java
+++ b/server-core/src/main/java/io/onedev/server/web/util/ReferenceTransformer.java
@@ -27,6 +27,10 @@ public class ReferenceTransformer implements Function<String, String> {
private final String url;
+ public ReferenceTransformer(Project project) {
+ this(project, null);
+ }
+
public ReferenceTransformer(Project project, @Nullable String url) {
this.project = project;
this.url = url;
@@ -42,7 +46,7 @@ public class ReferenceTransformer implements Function<String, String> {
@Override
protected String toHtml(ProjectScopedNumber referenceable, String referenceText) {
return "<a class='embedded-reference' href='" + RequestCycle.get().urlFor(IssueActivitiesPage.class,
- IssueActivitiesPage.paramsOf(referenceable, null)) + "'>" + referenceText + "</a>";
+ IssueActivitiesPage.paramsOf(referenceable)) + "'>" + referenceText + "</a>";
}
}.parseReferences(project, doc);
@@ -52,7 +56,7 @@ public class ReferenceTransformer implements Function<String, String> {
@Override
protected String toHtml(ProjectScopedNumber referenceable, String referenceText) {
return "<a class='embedded-reference' href='" + RequestCycle.get().urlFor(PullRequestActivitiesPage.class,
- PullRequestActivitiesPage.paramsOf(referenceable, null)) + "'>" + referenceText + "</a>";
+ PullRequestActivitiesPage.paramsOf(referenceable)) + "'>" + referenceText + "</a>";
}
}.parseReferences(project, doc);
@@ -62,7 +66,7 @@ public class ReferenceTransformer implements Function<String, String> {
@Override
protected String toHtml(ProjectScopedNumber referenceable, String referenceText) {
return "<a class='embedded-reference' href='" + RequestCycle.get().urlFor(BuildDashboardPage.class,
- BuildDashboardPage.paramsOf(referenceable, null)) + "'>" + referenceText + "</a>";
+ BuildDashboardPage.paramsOf(referenceable)) + "'>" + referenceText + "</a>";
}
}.parseReferences(project, doc);
@@ -71,7 +75,7 @@ public class ReferenceTransformer implements Function<String, String> {
StringBuilder builder = new StringBuilder();
for (Node node: Jsoup.parseBodyFragment(doc.body().html()).body().child(0).childNodes()) {
if (node instanceof TextNode)
- builder.append("<a href='" + url + "'>" + node.outerHtml() + "</a>");
+ builder.append(String.format("<a href='%s'>%s</a>", url, node.outerHtml()));
else
builder.append(node.outerHtml());
}
diff --git a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportPage.java b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportPage.java
index 2560194f0e..86e7ac13ee 100644
--- a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportPage.java
+++ b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportPage.java
@@ -4,9 +4,6 @@ import java.io.File;
import java.nio.charset.StandardCharsets;
import java.util.concurrent.Callable;
-import javax.annotation.Nullable;
-
-import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.head.IHeaderResponse;
@@ -22,7 +19,6 @@ import io.onedev.commons.utils.LockUtils;
import io.onedev.server.model.Build;
import io.onedev.server.util.SecurityUtils;
import io.onedev.server.web.page.project.builds.detail.BuildDetailPage;
-import io.onedev.server.web.util.Cursor;
@SuppressWarnings("serial")
public class HtmlReportPage extends BuildDetailPage {
@@ -92,15 +88,8 @@ public class HtmlReportPage extends BuildDetailPage {
return reportName;
}
- @Override
- protected void navTo(AjaxRequestTarget target, Build entity, Cursor cursor) {
- PageParameters params = BuildDetailPage.paramsOf(entity, cursor);
- params.add(PARAM_REPORT, getReportName());
- setResponsePage(getPageClass(), params);
- }
-
- public static PageParameters paramsOf(Build build, @Nullable Cursor cursor, String reportName) {
- PageParameters params = paramsOf(build, cursor);
+ public static PageParameters paramsOf(Build build, String reportName) {
+ PageParameters params = paramsOf(build);
params.add(PARAM_REPORT, reportName);
return params;
}
diff --git a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportTab.java b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportTab.java
index 6eb04a0f6f..82ab0e08b2 100644
--- a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportTab.java
+++ b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportTab.java
@@ -25,7 +25,7 @@ public class HtmlReportTab extends BuildTab {
protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {
BuildDetailPage page = (BuildDetailPage) getPage();
PageParameters params = HtmlReportPage.paramsOf(
- page.getBuild(), page.getCursor(), getTitle());
+ page.getBuild(), getTitle());
return new ViewStateAwarePageLink<Void>(linkId, pageClass, params);
}