Skip to content

The Unified and Autonomous Development Platform

feat: Preserve scroll position when switch between issue tabs (OD-2432)

Robin Shen3123a093bebd
diff --git a/server-core/src/main/java/io/onedev/server/entityreference/LinkTransformer.java b/server-core/src/main/java/io/onedev/server/entityreference/LinkTransformer.java
index cf90a46552..f7864d150e 100644
--- a/server-core/src/main/java/io/onedev/server/entityreference/LinkTransformer.java
+++ b/server-core/src/main/java/io/onedev/server/entityreference/LinkTransformer.java
@@ -8,7 +8,7 @@ import org.apache.wicket.request.cycle.RequestCycle;
import org.unbescape.html.HtmlEscape;
import io.onedev.server.web.page.project.builds.detail.dashboard.BuildDashboardPage;
-import io.onedev.server.web.page.project.issues.detail.IssueDetailPage;
+import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;
import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;
public class LinkTransformer implements BiFunction<EntityReference, String, String> {
@@ -23,8 +23,8 @@ public class LinkTransformer implements BiFunction<EntityReference, String, Stri
public String apply(@Nullable EntityReference reference, String text) {
text = HtmlEscape.escapeHtml5(text);
if (reference instanceof IssueReference) {
- return "<a class='embedded-reference link-info' href='" + RequestCycle.get().urlFor(IssueDetailPage.class,
- IssueDetailPage.paramsOf(reference.getProject(), reference.getNumber())) + "'>" + text + "</a>";
+ return "<a class='embedded-reference link-info' href='" + RequestCycle.get().urlFor(IssueActivitiesPage.class,
+ IssueActivitiesPage.paramsOf(reference.getProject(), reference.getNumber())) + "'>" + text + "</a>";
} else if (reference instanceof BuildReference) {
return "<a class='embedded-reference link-info' href='" + RequestCycle.get().urlFor(BuildDashboardPage.class,
BuildDashboardPage.paramsOf(reference.getProject(), reference.getNumber())) + "'>" + text + "</a>";
diff --git a/server-core/src/main/java/io/onedev/server/markdown/ReferenceProcessor.java b/server-core/src/main/java/io/onedev/server/markdown/ReferenceProcessor.java
index 0c8a4f0b63..167f33e7b5 100644
--- a/server-core/src/main/java/io/onedev/server/markdown/ReferenceProcessor.java
+++ b/server-core/src/main/java/io/onedev/server/markdown/ReferenceProcessor.java
@@ -18,7 +18,7 @@ import io.onedev.server.web.UrlManager;
import io.onedev.server.web.component.markdown.SuggestionSupport;
import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
import io.onedev.server.web.page.project.builds.detail.dashboard.BuildDashboardPage;
-import io.onedev.server.web.page.project.issues.detail.IssueDetailPage;
+import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;
import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;
public class ReferenceProcessor implements HtmlProcessor {
@@ -33,7 +33,7 @@ public class ReferenceProcessor implements HtmlProcessor {
if (reference instanceof IssueReference) {
String url;
if (RequestCycle.get() != null)
- url = RequestCycle.get().urlFor(IssueDetailPage.class, IssueDetailPage.paramsOf(reference.getProject(), reference.getNumber())).toString();
+ url = RequestCycle.get().urlFor(IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(reference.getProject(), reference.getNumber())).toString();
else
url = OneDev.getInstance(UrlManager.class).urlForIssue(reference.getProject(), reference.getNumber());
return String.format("<a href='%s' class='issue reference' data-reference='%s'>%s</a>",
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 220b294fa2..0b36019b57 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
@@ -73,7 +73,7 @@ import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.page.base.BasePage;
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.page.project.issues.detail.IssueDetailPage;
+import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;
import io.onedev.server.web.page.project.issues.iteration.IterationIssuesPage;
import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;
import io.onedev.server.web.util.ProjectAware;
@@ -267,8 +267,8 @@ public abstract class FieldValuesPanel extends Panel implements EditContext, Pro
Issue issue = OneDev.getInstance(IssueManager.class).get(Long.valueOf(value));
if (issue != null) {
Fragment linkFrag = new Fragment("value", "linkFrag", FieldValuesPanel.this);
- Link<Void> issueLink = new BookmarkablePageLink<Void>("link", IssueDetailPage.class,
- IssueDetailPage.paramsOf(issue));
+ Link<Void> issueLink = new BookmarkablePageLink<Void>("link", IssueActivitiesPage.class,
+ IssueActivitiesPage.paramsOf(issue));
issueLink.add(new Label("label", issue.getReference().toString(getProject())));
linkFrag.add(issueLink);
valueContainer.add(linkFrag);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/primary/IssuePrimaryPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/primary/IssuePrimaryPanel.java
index 76ba08e7b0..0d17c8a572 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/primary/IssuePrimaryPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/primary/IssuePrimaryPanel.java
@@ -77,7 +77,7 @@ import io.onedev.server.web.component.tabbable.Tabbable;
import io.onedev.server.web.component.user.ident.Mode;
import io.onedev.server.web.component.user.ident.UserIdentPanel;
import io.onedev.server.web.page.base.BasePage;
-import io.onedev.server.web.page.project.issues.detail.IssueDetailPage;
+import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;
import io.onedev.server.web.util.DeleteCallback;
public abstract class IssuePrimaryPanel extends Panel {
@@ -515,8 +515,8 @@ public abstract class IssuePrimaryPanel extends Panel {
Long linkedIssueId = linkedIssue.getId();
Fragment fragment = new Fragment(componentId, "linkedIssueFrag", this);
- var link = new BookmarkablePageLink<Void>("title", IssueDetailPage.class,
- IssueDetailPage.paramsOf(linkedIssue));
+ var link = new BookmarkablePageLink<Void>("title", IssueActivitiesPage.class,
+ IssueActivitiesPage.paramsOf(linkedIssue));
link.add(new Label("label", linkedIssue.getTitle() + " (" + linkedIssue.getReference().toString(getProject()) + ")"));
fragment.add(link);
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 173fd8e5d1..0e64806561 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
@@ -14,7 +14,7 @@ import io.onedev.server.model.Project;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.component.issue.IssueStateBadge;
import io.onedev.server.web.page.project.ProjectPage;
-import io.onedev.server.web.page.project.issues.detail.IssueDetailPage;
+import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;
public class ReferencedFromIssuePanel extends GenericPanel<Issue> {
@@ -40,8 +40,8 @@ public class ReferencedFromIssuePanel extends GenericPanel<Issue> {
Issue issue = getModelObject();
if (SecurityUtils.canAccessProject(issue.getProject())) {
- String url = RequestCycle.get().urlFor(IssueDetailPage.class,
- IssueDetailPage.paramsOf(issue)).toString();
+ String url = RequestCycle.get().urlFor(IssueActivitiesPage.class,
+ IssueActivitiesPage.paramsOf(issue)).toString();
String summary = String.format("<a href='%s'>%s</a>",
url, escapeHtml5(issue.getSummary(project)));
add(new Label("summary", summary).setEscapeModelStrings(false));
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/tabs/IssueTabsPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/tabs/IssueTabsPanel.html
deleted file mode 100644
index 049e8b2f5c..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/tabs/IssueTabsPanel.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<wicket:panel>
- <ul wicket:id="tabs" class="tabs nav nav-tabs nav-tabs-line nav-bold mb-5"></ul>
- <div wicket:id="tabContent"></div>
-</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/tabs/IssueTabsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/tabs/IssueTabsPanel.java
deleted file mode 100644
index 064a24be35..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/tabs/IssueTabsPanel.java
+++ /dev/null
@@ -1,214 +0,0 @@
-package io.onedev.server.web.component.issue.tabs;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.markup.html.panel.GenericPanel;
-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 com.google.common.collect.Lists;
-
-import io.onedev.server.model.Issue;
-import io.onedev.server.model.Project;
-import io.onedev.server.search.entity.build.BuildQuery;
-import io.onedev.server.search.entity.build.FixedIssueCriteria;
-import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.web.behavior.ChangeObserver;
-import io.onedev.server.web.component.build.list.BuildListPanel;
-import io.onedev.server.web.component.issue.activities.IssueActivitiesPanel;
-import io.onedev.server.web.component.issue.authorizations.IssueAuthorizationsPanel;
-import io.onedev.server.web.component.issue.commits.IssueCommitsPanel;
-import io.onedev.server.web.component.issue.pullrequests.IssuePullRequestsPanel;
-import io.onedev.server.web.component.tabbable.AjaxActionTab;
-import io.onedev.server.web.component.tabbable.Tab;
-import io.onedev.server.web.component.tabbable.Tabbable;
-
-public class IssueTabsPanel extends GenericPanel<Issue> {
-
- private static final String TAB_CONTENT_ID = "tabContent";
-
- private IssueActivitiesPanel activities;
-
- public IssueTabsPanel(String id, IModel<Issue> model) {
- super(id, model);
- }
-
- private IssueActivitiesPanel newActivitiesPanel() {
- IssueActivitiesPanel activities = new IssueActivitiesPanel(TAB_CONTENT_ID) {
-
- @Override
- protected Issue getIssue() {
- return IssueTabsPanel.this.getIssue();
- }
-
- };
- activities.setOutputMarkupId(true);
- return activities;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- add(new Tabbable("tabs", new LoadableDetachableModel<>() {
-
- @Override
- protected List<? extends Tab> load() {
- List<Tab> tabs = new ArrayList<>();
-
- tabs.add(new AjaxActionTab(Model.of("Activities")) {
-
- @Override
- protected void onSelect(AjaxRequestTarget target, Component tabLink) {
- activities = newActivitiesPanel();
- IssueTabsPanel.this.replace(activities);
- target.add(activities);
- }
-
- @Override
- public boolean isSelected() {
- return IssueTabsPanel.this.get(TAB_CONTENT_ID) instanceof IssueActivitiesPanel;
- }
-
- @Override
- protected Component renderOptions(String componentId) {
- return activities.renderOptions(componentId);
- }
-
- });
-
- if (!getIssue().getFixCommits(false).isEmpty()) {
- if (SecurityUtils.canReadCode(getIssue().getProject())) {
- tabs.add(new AjaxActionTab(Model.of("Fixing Commits")) {
-
- @Override
- protected void onSelect(AjaxRequestTarget target, Component tabLink) {
- Component content = new IssueCommitsPanel(TAB_CONTENT_ID, IssueTabsPanel.this.getModel());
- content.setOutputMarkupId(true);
- IssueTabsPanel.this.replace(content);
- target.add(content);
- }
-
- @Override
- public boolean isSelected() {
- return IssueTabsPanel.this.get(TAB_CONTENT_ID) instanceof IssueCommitsPanel;
- }
-
- });
- if (!getIssue().getPullRequests().isEmpty()) {
- tabs.add(new AjaxActionTab(Model.of("Pull Requests")) {
-
- @Override
- protected void onSelect(AjaxRequestTarget target, Component tabLink) {
- Component content = new IssuePullRequestsPanel(TAB_CONTENT_ID, new AbstractReadOnlyModel<Issue>() {
-
- @Override
- public Issue getObject() {
- return getIssue();
- }
-
- });
- IssueTabsPanel.this.replace(content);
- target.add(content);
- }
-
- @Override
- public boolean isSelected() {
- return IssueTabsPanel.this.get(TAB_CONTENT_ID) instanceof IssuePullRequestsPanel;
- }
-
- });
- }
- }
-
- tabs.add(new AjaxActionTab(Model.of("Fixing Builds")) {
-
- @Override
- protected void onSelect(AjaxRequestTarget target, Component tabLink) {
- Component content = new BuildListPanel(TAB_CONTENT_ID, Model.of((String)null), true, true) {
-
- @Override
- protected BuildQuery getBaseQuery() {
- return new BuildQuery(new FixedIssueCriteria(getIssue()), new ArrayList<>());
- }
-
- @Override
- protected Project getProject() {
- return getIssue().getProject();
- }
-
- }.setOutputMarkupId(true);
-
- IssueTabsPanel.this.replace(content);
- target.add(content);
- }
-
- @Override
- public boolean isSelected() {
- return IssueTabsPanel.this.get(TAB_CONTENT_ID) instanceof BuildListPanel;
- }
-
- });
- }
-
- if (getIssue().isConfidential() && SecurityUtils.canModifyIssue(getIssue())) {
- tabs.add(new AjaxActionTab(Model.of("Authorizations")) {
-
- @Override
- protected void onSelect(AjaxRequestTarget target, Component tabLink) {
- Component content = new IssueAuthorizationsPanel(TAB_CONTENT_ID) {
-
- @Override
- protected Issue getIssue() {
- return IssueTabsPanel.this.getIssue();
- }
-
- }.setOutputMarkupId(true);
-
- IssueTabsPanel.this.replace(content);
- target.add(content);
- }
-
- @Override
- public boolean isSelected() {
- return IssueTabsPanel.this.get(TAB_CONTENT_ID) instanceof IssueAuthorizationsPanel;
- }
-
- });
- }
-
- return tabs;
- }
-
- }) {
- @Override
- public void onInitialize() {
- super.onInitialize();
-
- add(new ChangeObserver() {
-
- @Override
- public Collection<String> findObservables() {
- return Lists.newArrayList(Issue.getDetailChangeObservable(getIssue().getId()));
- }
-
- });
-
- setOutputMarkupId(true);
- }
- });
-
- add(activities = newActivitiesPanel());
- }
-
- private Issue getIssue() {
- return getModelObject();
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java
index fa21a8a235..0e8aaef0bd 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java
@@ -20,7 +20,7 @@ import io.onedev.server.model.Project;
import io.onedev.server.web.WebSession;
import io.onedev.server.web.asset.emoji.Emojis;
import io.onedev.server.web.component.link.ActionablePageLink;
-import io.onedev.server.web.page.project.issues.detail.IssueDetailPage;
+import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;
import io.onedev.server.web.util.Cursor;
public abstract class IssueTitlePanel extends Panel {
@@ -37,7 +37,7 @@ public abstract class IssueTitlePanel extends Panel {
var label = "(" + issue.getReference().toString(getCurrentProject()) + ")";
WebMarkupContainer numberLink;
add(numberLink = new ActionablePageLink("number",
- IssueDetailPage.class, IssueDetailPage.paramsOf(issue)) {
+ IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(issue)) {
@Override
public IModel<?> getBody() {
@@ -54,8 +54,8 @@ public abstract class IssueTitlePanel extends Panel {
});
- String url = RequestCycle.get().urlFor(IssueDetailPage.class,
- IssueDetailPage.paramsOf(issue)).toString();
+ String url = RequestCycle.get().urlFor(IssueActivitiesPage.class,
+ IssueActivitiesPage.paramsOf(issue)).toString();
var transformed = transformReferences(issue.getTitle(), issue.getProject(), new LinkTransformer(url));
transformed = Emojis.getInstance().apply(transformed);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/link/ViewStateAwarePageLink.java b/server-core/src/main/java/io/onedev/server/web/component/link/ViewStateAwarePageLink.java
index b384110b6d..8048d0e5e9 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/link/ViewStateAwarePageLink.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/link/ViewStateAwarePageLink.java
@@ -14,17 +14,29 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
*/
public class ViewStateAwarePageLink<T> extends BookmarkablePageLink<T> {
+ private final String scrollTopKey;
+
public <C extends Page> ViewStateAwarePageLink(String id, final Class<C> pageClass) {
- super(id, pageClass);
+ this(id, pageClass, new PageParameters());
}
public <C extends Page> ViewStateAwarePageLink(String id, final Class<C> pageClass, PageParameters parameters) {
+ this(id, pageClass, parameters, null);
+ }
+
+ public <C extends Page> ViewStateAwarePageLink(String id, final Class<C> pageClass, PageParameters parameters, String scrollTopKey) {
super(id, pageClass, parameters);
+ this.scrollTopKey = scrollTopKey;
}
@Override
protected CharSequence getOnClickScript(CharSequence url) {
- return "onedev.server.viewState.getFromViewAndSetToHistory();";
+ var script = "onedev.server.viewState.getFromViewAndSetToHistory();";
+ if (scrollTopKey != null) {
+ script += "" +
+ "localStorage.setItem('" + scrollTopKey + "', Math.floor($(this).closest('.autofit').scrollTop()).toString());";
+ }
+ return script;
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/tabbable/PageTabHead.java b/server-core/src/main/java/io/onedev/server/web/component/tabbable/PageTabHead.java
index 1634905be9..7428d9fa3f 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/tabbable/PageTabHead.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/tabbable/PageTabHead.java
@@ -15,8 +15,8 @@ public class PageTabHead extends Panel {
private final PageTab tab;
- public PageTabHead(String id, PageTab tab) {
- super(id);
+ public PageTabHead(String componentId, PageTab tab) {
+ super(componentId);
this.tab = tab;
}
@@ -33,8 +33,8 @@ public class PageTabHead extends Panel {
link.add(new Label("label", tab.getTitleModel()));
}
- protected Link<?> newLink(String linkId, Class<? extends Page> pageClass, PageParameters pageParams) {
- return new ViewStateAwarePageLink<Void>(linkId, pageClass, pageParams);
+ protected Link<?> newLink(String componentId, Class<? extends Page> pageClass, PageParameters pageParams) {
+ return new ViewStateAwarePageLink<Void>(componentId, pageClass, pageParams);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java b/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java
index 05bdbeff52..3dd81511ba 100644
--- a/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java
+++ b/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java
@@ -117,7 +117,12 @@ import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;
import io.onedev.server.web.page.project.imports.ProjectImportPage;
import io.onedev.server.web.page.project.issues.boards.IssueBoardsPage;
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.page.project.issues.detail.IssueAuthorizationsPage;
+import io.onedev.server.web.page.project.issues.detail.IssueBuildsPage;
+import io.onedev.server.web.page.project.issues.detail.IssueCommitsPage;
import io.onedev.server.web.page.project.issues.detail.IssueDetailPage;
+import io.onedev.server.web.page.project.issues.detail.IssuePullRequestsPage;
import io.onedev.server.web.page.project.issues.imports.IssueImportPage;
import io.onedev.server.web.page.project.issues.iteration.IterationBurndownPage;
import io.onedev.server.web.page.project.issues.iteration.IterationEditPage;
@@ -392,6 +397,11 @@ public class BaseUrlMapper extends CompoundRequestMapper {
add(new ProjectPageMapper("${project}/~boards/${board}", IssueBoardsPage.class));
add(new ProjectPageMapper("${project}/~issues", ProjectIssueListPage.class));
add(new ProjectPageMapper("${project}/~issues/${issue}", IssueDetailPage.class));
+ add(new ProjectPageMapper("${project}/~issues/${issue}", IssueActivitiesPage.class));
+ add(new ProjectPageMapper("${project}/~issues/${issue}/commits", IssueCommitsPage.class));
+ add(new ProjectPageMapper("${project}/~issues/${issue}/pulls", IssuePullRequestsPage.class));
+ add(new ProjectPageMapper("${project}/~issues/${issue}/builds", IssueBuildsPage.class));
+ add(new ProjectPageMapper("${project}/~issues/${issue}/authorizations", IssueAuthorizationsPage.class));
add(new ProjectPageMapper("${project}/~issues/new", NewIssuePage.class));
add(new ProjectPageMapper("${project}/~issues/import/${importer}", IssueImportPage.class));
add(new ProjectPageMapper("${project}/~iterations", IterationListPage.class));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.html
index cb5590799a..666499991d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.html
@@ -9,7 +9,8 @@
<div class="main flex-grow-1">
<div wicket:id="operations" class="mb-5"></div>
<div wicket:id="primary" class="mb-5"></div>
- <div wicket:id="tabs"></div>
+ <ul wicket:id="tabs" class="tabs nav nav-tabs nav-tabs-line nav-bold mb-5"></ul>
+ <div wicket:id="tabContent"></div>
</div>
<div wicket:id="moreInfo"></div>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java
index 11f4788205..7735307390 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java
@@ -1,5 +1,6 @@
package io.onedev.server.web.page.project.issues.boards;
+import java.util.ArrayList;
import java.util.List;
import javax.annotation.Nullable;
@@ -9,7 +10,9 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.markup.html.panel.GenericPanel;
+import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
import org.apache.wicket.request.cycle.AbstractRequestCycleListener;
import org.apache.wicket.request.cycle.RequestCycle;
@@ -21,25 +24,38 @@ import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.search.entity.build.BuildQuery;
+import io.onedev.server.search.entity.build.FixedIssueCriteria;
import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.search.entity.issue.IssueQueryParseOption;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.ProjectScope;
import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
+import io.onedev.server.web.component.build.list.BuildListPanel;
import io.onedev.server.web.component.entity.nav.EntityNavPanel;
+import io.onedev.server.web.component.issue.activities.IssueActivitiesPanel;
+import io.onedev.server.web.component.issue.authorizations.IssueAuthorizationsPanel;
+import io.onedev.server.web.component.issue.commits.IssueCommitsPanel;
import io.onedev.server.web.component.issue.editabletitle.IssueEditableTitlePanel;
import io.onedev.server.web.component.issue.operation.IssueOperationsPanel;
import io.onedev.server.web.component.issue.primary.IssuePrimaryPanel;
+import io.onedev.server.web.component.issue.pullrequests.IssuePullRequestsPanel;
import io.onedev.server.web.component.issue.side.IssueSidePanel;
-import io.onedev.server.web.component.issue.tabs.IssueTabsPanel;
import io.onedev.server.web.component.sideinfo.SideInfoLink;
import io.onedev.server.web.component.sideinfo.SideInfoPanel;
+import io.onedev.server.web.component.tabbable.AjaxActionTab;
+import io.onedev.server.web.component.tabbable.Tab;
+import io.onedev.server.web.component.tabbable.Tabbable;
import io.onedev.server.web.util.CursorSupport;
import io.onedev.server.xodus.VisitInfoManager;
abstract class CardDetailPanel extends GenericPanel<Issue> implements InputContext {
-
+
+ private static final String TAB_CONTENT_ID = "tabContent";
+
+ private IssueActivitiesPanel activities;
+
public CardDetailPanel(String id, IModel<Issue> model) {
super(id, model);
}
@@ -47,7 +63,20 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputConte
private Issue getIssue() {
return getModelObject();
}
-
+
+ private IssueActivitiesPanel newActivitiesPanel() {
+ IssueActivitiesPanel activities = new IssueActivitiesPanel(TAB_CONTENT_ID) {
+
+ @Override
+ protected Issue getIssue() {
+ return CardDetailPanel.this.getIssue();
+ }
+
+ };
+ activities.setOutputMarkupId(true);
+ return activities;
+ }
+
@Override
protected void onInitialize() {
super.onInitialize();
@@ -86,7 +115,104 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputConte
});
- add(new IssueTabsPanel("tabs", getModel()));
+ List<Tab> tabs = new ArrayList<>();
+ tabs.add(new AjaxActionTab(Model.of("Activities")) {
+
+ @Override
+ protected void onSelect(AjaxRequestTarget target, Component tabLink) {
+ activities = newActivitiesPanel();
+ CardDetailPanel.this.replace(activities);
+ target.add(activities);
+ }
+
+ @Override
+ protected Component renderOptions(String componentId) {
+ return activities.renderOptions(componentId);
+ }
+
+ });
+
+ if (!getIssue().getFixCommits(false).isEmpty()) {
+ if (SecurityUtils.canReadCode(getIssue().getProject())) {
+ tabs.add(new AjaxActionTab(Model.of("Fixing Commits")) {
+
+ @Override
+ protected void onSelect(AjaxRequestTarget target, Component tabLink) {
+ Component content = new IssueCommitsPanel(TAB_CONTENT_ID, CardDetailPanel.this.getModel());
+ content.setOutputMarkupId(true);
+ CardDetailPanel.this.replace(content);
+ target.add(content);
+ }
+
+ });
+ if (!getIssue().getPullRequests().isEmpty()) {
+ tabs.add(new AjaxActionTab(Model.of("Pull Requests")) {
+
+ @Override
+ protected void onSelect(AjaxRequestTarget target, Component tabLink) {
+ Component content = new IssuePullRequestsPanel(TAB_CONTENT_ID, new AbstractReadOnlyModel<Issue>() {
+
+ @Override
+ public Issue getObject() {
+ return getIssue();
+ }
+
+ });
+ CardDetailPanel.this.replace(content);
+ target.add(content);
+ }
+
+ });
+ }
+ }
+
+ tabs.add(new AjaxActionTab(Model.of("Fixing Builds")) {
+
+ @Override
+ protected void onSelect(AjaxRequestTarget target, Component tabLink) {
+ Component content = new BuildListPanel(TAB_CONTENT_ID, Model.of((String)null), true, true) {
+
+ @Override
+ protected BuildQuery getBaseQuery() {
+ return new BuildQuery(new FixedIssueCriteria(getIssue()), new ArrayList<>());
+ }
+
+ @Override
+ protected Project getProject() {
+ return getIssue().getProject();
+ }
+
+ }.setOutputMarkupId(true);
+
+ CardDetailPanel.this.replace(content);
+ target.add(content);
+ }
+
+ });
+
+ if (getIssue().isConfidential() && SecurityUtils.canModifyIssue(getIssue())) {
+ tabs.add(new AjaxActionTab(Model.of("Authorizations")) {
+
+ @Override
+ protected void onSelect(AjaxRequestTarget target, Component tabLink) {
+ Component content = new IssueAuthorizationsPanel(TAB_CONTENT_ID) {
+
+ @Override
+ protected Issue getIssue() {
+ return CardDetailPanel.this.getIssue();
+ }
+
+ }.setOutputMarkupId(true);
+
+ CardDetailPanel.this.replace(content);
+ target.add(content);
+ }
+
+ });
+ }
+ }
+
+ add(new Tabbable("tabs", tabs).setOutputMarkupId(true));
add(new SideInfoPanel("moreInfo") {
@@ -127,9 +253,7 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputConte
@Override
protected EntityQuery<Issue> parse(String queryString, Project project) {
- IssueQueryParseOption option = new IssueQueryParseOption()
- .withCurrentProjectCriteria(true)
- .withCurrentUserCriteria(true);
+ IssueQueryParseOption option = new IssueQueryParseOption().withCurrentUserCriteria(true);
return IssueQuery.parse(project, queryString, option, true);
}
@@ -154,7 +278,9 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputConte
}
});
-
+
+ add(activities = newActivitiesPanel());
+
add(new AjaxLink<Void>("close") {
@Override
@@ -177,7 +303,7 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputConte
if (SecurityUtils.getAuthUser() != null)
OneDev.getInstance(VisitInfoManager.class).visitIssue(SecurityUtils.getAuthUser(), getIssue());
}
-
+
});
setOutputMarkupId(true);
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 e7b1264e46..a92f28e6f6 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
@@ -32,7 +32,7 @@ import io.onedev.server.web.component.issue.workflowreconcile.WorkflowChangeAler
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.page.project.ProjectPage;
import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;
-import io.onedev.server.web.page.project.issues.detail.IssueDetailPage;
+import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;
import io.onedev.server.web.page.project.issues.list.ProjectIssueListPage;
import io.onedev.server.web.page.simple.security.LoginPage;
@@ -106,7 +106,7 @@ public class NewIssuePage extends ProjectPage implements InputContext {
super.onSubmit();
Issue issue = editor.getConvertedInput();
OneDev.getInstance(IssueManager.class).open(issue);
- setResponsePage(IssueDetailPage.class, IssueDetailPage.paramsOf(issue));
+ setResponsePage(IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(issue));
}
};
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueActivitiesPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueActivitiesPage.html
new file mode 100644
index 0000000000..199d391a98
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueActivitiesPage.html
@@ -0,0 +1,3 @@
+<wicket:extend>
+ <div wicket:id="activities"></div>
+</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueActivitiesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueActivitiesPage.java
new file mode 100644
index 0000000000..20dc73bbb1
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueActivitiesPage.java
@@ -0,0 +1,34 @@
+package io.onedev.server.web.page.project.issues.detail;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import io.onedev.server.model.Issue;
+import io.onedev.server.web.component.issue.activities.IssueActivitiesPanel;
+
+public class IssueActivitiesPage extends IssueDetailPage {
+
+ private IssueActivitiesPanel activities;
+
+ public IssueActivitiesPage(PageParameters params) {
+ super(params);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(activities = new IssueActivitiesPanel("activities") {
+
+ @Override
+ protected Issue getIssue() {
+ return IssueActivitiesPage.this.getIssue();
+ }
+
+ });
+ }
+
+ public Component renderOptions(String componentId) {
+ return activities.renderOptions(componentId);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueAuthorizationsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueAuthorizationsPage.html
new file mode 100644
index 0000000000..df338de0b1
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueAuthorizationsPage.html
@@ -0,0 +1,3 @@
+<wicket:extend>
+ <div wicket:id="authorizations"></div>
+</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueAuthorizationsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueAuthorizationsPage.java
new file mode 100644
index 0000000000..152a2b26cc
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueAuthorizationsPage.java
@@ -0,0 +1,28 @@
+package io.onedev.server.web.page.project.issues.detail;
+
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import io.onedev.server.model.Issue;
+import io.onedev.server.web.component.issue.authorizations.IssueAuthorizationsPanel;
+
+public class IssueAuthorizationsPage extends IssueDetailPage {
+
+ public IssueAuthorizationsPage(PageParameters params) {
+ super(params);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(new IssueAuthorizationsPanel("authorizations") {
+
+ @Override
+ protected Issue getIssue() {
+ return IssueAuthorizationsPage.this.getIssue();
+ }
+
+ });
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueBuildsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueBuildsPage.html
new file mode 100644
index 0000000000..10ae2852bf
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueBuildsPage.html
@@ -0,0 +1,3 @@
+<wicket:extend>
+ <div wicket:id="builds"></div>
+</wicket:extend>
\ No newline at end of file
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
new file mode 100644
index 0000000000..aedf335e43
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueBuildsPage.java
@@ -0,0 +1,108 @@
+package io.onedev.server.web.page.project.issues.detail;
+
+import java.io.Serializable;
+
+import javax.annotation.Nullable;
+
+import io.onedev.server.web.util.paginghistory.ParamPagingHistorySupport;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import io.onedev.server.model.Issue;
+import io.onedev.server.model.Project;
+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.paginghistory.PagingHistorySupport;
+
+public class IssueBuildsPage extends IssueDetailPage {
+
+ private static final String PARAM_QUERY = "query";
+
+ private static final String PARAM_PAGE = "page";
+
+ private String query;
+
+ private BuildListPanel buildList;
+
+ public IssueBuildsPage(PageParameters params) {
+ super(params);
+ query = params.get(PARAM_QUERY).toString();
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(buildList = new BuildListPanel("builds", new IModel<String>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public String getObject() {
+ return query;
+ }
+
+ @Override
+ public void setObject(String object) {
+ query = object;
+ PageParameters params = getPageParameters();
+ params.set(PARAM_QUERY, query);
+ params.remove(PARAM_PAGE);
+ CharSequence url = RequestCycle.get().urlFor(IssueBuildsPage.class, params);
+ pushState(RequestCycle.get().find(AjaxRequestTarget.class), url.toString(), query);
+ }
+
+ }, true, true) {
+
+ @Override
+ protected BuildQuery getBaseQuery() {
+ return new BuildQuery(new FixedIssueCriteria(getIssue()));
+ }
+
+ @Override
+ protected PagingHistorySupport getPagingHistorySupport() {
+ return new ParamPagingHistorySupport() {
+
+ @Override
+ public PageParameters newPageParameters(int currentPage) {
+ PageParameters params = paramsOf(getIssue(), query);
+ params.add(PARAM_PAGE, currentPage+1);
+ return params;
+ }
+
+ @Override
+ public int getCurrentPage() {
+ return getPageParameters().get(PARAM_PAGE).toInt(1)-1;
+ }
+
+ };
+ }
+
+ @Override
+ protected Project getProject() {
+ return null;
+ }
+
+ });
+ }
+
+ @Override
+ protected void onPopState(AjaxRequestTarget target, Serializable data) {
+ query = (String) data;
+ getPageParameters().set(PARAM_QUERY, query);
+ target.add(buildList);
+ }
+
+ 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/IssueCommitsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueCommitsPage.html
new file mode 100644
index 0000000000..e93fdf5f96
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueCommitsPage.html
@@ -0,0 +1,3 @@
+<wicket:extend>
+ <div wicket:id="commits"></div>
+</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueCommitsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueCommitsPage.java
new file mode 100644
index 0000000000..91f1b0ab18
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueCommitsPage.java
@@ -0,0 +1,19 @@
+package io.onedev.server.web.page.project.issues.detail;
+
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import io.onedev.server.web.component.issue.commits.IssueCommitsPanel;
+
+public class IssueCommitsPage extends IssueDetailPage {
+
+ public IssueCommitsPage(PageParameters params) {
+ super(params);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new IssueCommitsPanel("commits", issueModel));
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailCssResourceReference.java
deleted file mode 100644
index dee4032322..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailCssResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.web.page.project.issues.detail;
-
-import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
-
-public class IssueDetailCssResourceReference extends BaseDependentCssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public IssueDetailCssResourceReference() {
- super(IssueDetailCssResourceReference.class, "issue-detail.css");
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.html
index 534b4582b1..bb46f1acb0 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.html
@@ -8,7 +8,8 @@
<div class="main flex-grow-1">
<div wicket:id="operations" class="mb-5"></div>
<div wicket:id="primary" class="mb-5"></div>
- <div wicket:id="issueTabs"></div>
+ <ul wicket:id="issueTabs" class="tabs nav nav-tabs nav-tabs-line nav-bold mb-5"></ul>
+ <wicket:child></wicket:child>
</div>
<div wicket:id="side"></div>
</div>
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 080b68b63b..4b20ecc4a3 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
@@ -1,5 +1,7 @@
package io.onedev.server.web.page.project.issues.detail;
+import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
import javax.persistence.EntityNotFoundException;
@@ -7,22 +9,27 @@ import javax.validation.ValidationException;
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.Component;
+import org.apache.wicket.Page;
import org.apache.wicket.RestartResponseException;
import org.apache.wicket.Session;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.html.basic.Label;
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.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.model.Model;
import org.apache.wicket.request.cycle.AbstractRequestCycleListener;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.flow.RedirectToUrlException;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import com.google.common.collect.Lists;
+
import io.onedev.server.OneDev;
import io.onedev.server.buildspecmodel.inputspec.InputContext;
import io.onedev.server.entitymanager.IssueLinkManager;
@@ -37,15 +44,19 @@ import io.onedev.server.search.entity.issue.IssueQueryParseOption;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.ProjectScope;
import io.onedev.server.web.WebSession;
+import io.onedev.server.web.behavior.ChangeObserver;
import io.onedev.server.web.component.entity.nav.EntityNavPanel;
import io.onedev.server.web.component.issue.editabletitle.IssueEditableTitlePanel;
import io.onedev.server.web.component.issue.operation.IssueOperationsPanel;
import io.onedev.server.web.component.issue.primary.IssuePrimaryPanel;
import io.onedev.server.web.component.issue.side.IssueSidePanel;
-import io.onedev.server.web.component.issue.tabs.IssueTabsPanel;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.component.sideinfo.SideInfoLink;
import io.onedev.server.web.component.sideinfo.SideInfoPanel;
+import io.onedev.server.web.component.tabbable.PageTab;
+import io.onedev.server.web.component.tabbable.PageTabHead;
+import io.onedev.server.web.component.tabbable.Tab;
+import io.onedev.server.web.component.tabbable.Tabbable;
import io.onedev.server.web.page.project.ProjectPage;
import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;
import io.onedev.server.web.page.project.issues.ProjectIssuesPage;
@@ -55,10 +66,12 @@ import io.onedev.server.web.util.Cursor;
import io.onedev.server.web.util.CursorSupport;
import io.onedev.server.xodus.VisitInfoManager;
-public class IssueDetailPage extends ProjectIssuesPage implements InputContext {
+public abstract class IssueDetailPage extends ProjectIssuesPage implements InputContext {
public static final String PARAM_ISSUE = "issue";
+ private static final String KEY_SCROLL_TOP = "onedev.issue.scrollTop";
+
protected final IModel<Issue> issueModel;
public IssueDetailPage(PageParameters params) {
@@ -141,7 +154,123 @@ public class IssueDetailPage extends ProjectIssuesPage implements InputContext {
}
});
- add(new IssueTabsPanel("issueTabs", issueModel));
+ add(new Tabbable("issueTabs", new LoadableDetachableModel<>() {
+ @Override
+ protected List<? extends Tab> load() {
+ List<Tab> tabs = new ArrayList<>();
+ tabs.add(new PageTab(Model.of("Activities"), IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(getIssue())) {
+
+ @Override
+ public Component render(String componentId) {
+ return new PageTabHead(componentId, this) {
+
+ @Override
+ protected Link<?> newLink(String componentId, Class<? extends Page> pageClass, PageParameters pageParams) {
+ return new ViewStateAwarePageLink<Void>(componentId, pageClass, pageParams, KEY_SCROLL_TOP);
+ }
+
+ };
+ }
+
+ @Override
+ protected Component renderOptions(String componentId) {
+ IssueActivitiesPage page = (IssueActivitiesPage) getPage();
+ return page.renderOptions(componentId);
+ }
+
+ });
+
+ if (!getIssue().getFixCommits(false).isEmpty()) {
+ if (SecurityUtils.canReadCode(getProject())) {
+ tabs.add(new PageTab(Model.of("Fixing Commits"), IssueCommitsPage.class, IssueCommitsPage.paramsOf(getIssue())) {
+
+ @Override
+ public Component render(String componentId) {
+ return new PageTabHead(componentId, this) {
+
+ @Override
+ protected Link<?> newLink(String componentId, Class<? extends Page> pageClass, PageParameters pageParams) {
+ return new ViewStateAwarePageLink<Void>(componentId, pageClass, pageParams, KEY_SCROLL_TOP);
+ }
+
+ };
+ }
+
+ });
+ if (!getIssue().getPullRequests().isEmpty()) {
+ tabs.add(new PageTab(Model.of("Pull Requests"), IssuePullRequestsPage.class, IssuePullRequestsPage.paramsOf(getIssue())) {
+
+ @Override
+ public Component render(String componentId) {
+ return new PageTabHead(componentId, this) {
+
+ @Override
+ protected Link<?> newLink(String componentId, Class<? extends Page> pageClass, PageParameters pageParams) {
+ return new ViewStateAwarePageLink<Void>(componentId, pageClass, pageParams, KEY_SCROLL_TOP);
+ }
+
+ };
+ }
+
+ });
+ }
+ }
+ // Do not calculate fix builds now as it might be slow
+ tabs.add(new PageTab(Model.of("Fixing Builds"), IssueBuildsPage.class, IssueBuildsPage.paramsOf(getIssue())) {
+
+ @Override
+ public Component render(String componentId) {
+ return new PageTabHead(componentId, this) {
+
+ @Override
+ protected Link<?> newLink(String componentId, Class<? extends Page> pageClass, PageParameters pageParams) {
+ return new ViewStateAwarePageLink<Void>(componentId, pageClass, pageParams, KEY_SCROLL_TOP);
+ }
+
+ };
+ }
+
+ });
+ }
+
+ if (getIssue().isConfidential() && SecurityUtils.canModifyIssue(getIssue())) {
+ tabs.add(new PageTab(Model.of("Authorizations"), IssueAuthorizationsPage.class, IssueAuthorizationsPage.paramsOf(getIssue())) {
+
+ @Override
+ public Component render(String componentId) {
+ return new PageTabHead(componentId, this) {
+
+ @Override
+ protected Link<?> newLink(String componentId, Class<? extends Page> pageClass, PageParameters pageParams) {
+ return new ViewStateAwarePageLink<Void>(componentId, pageClass, pageParams, KEY_SCROLL_TOP);
+ }
+
+ };
+ }
+
+ });
+ }
+
+ return tabs;
+ }
+
+ }) {
+ @Override
+ public void onInitialize() {
+ super.onInitialize();
+
+ add(new ChangeObserver() {
+
+ @Override
+ public Collection<String> findObservables() {
+ return Lists.newArrayList(Issue.getDetailChangeObservable(getIssue().getId()));
+ }
+
+ });
+
+ setOutputMarkupId(true);
+ }
+ });
add(new SideInfoPanel("side") {
@@ -222,13 +351,13 @@ public class IssueDetailPage extends ProjectIssuesPage implements InputContext {
});
RequestCycle.get().getListeners().add(new AbstractRequestCycleListener() {
-
+
@Override
public void onEndRequest(RequestCycle cycle) {
if (SecurityUtils.getAuthUser() != null)
OneDev.getInstance(VisitInfoManager.class).visitIssue(SecurityUtils.getAuthUser(), getIssue());
}
-
+
});
}
@@ -280,7 +409,8 @@ public class IssueDetailPage extends ProjectIssuesPage implements InputContext {
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
- response.render(CssHeaderItem.forReference(new IssueDetailCssResourceReference()));
+ response.render(JavaScriptHeaderItem.forReference(new IssueDetailResourceReference()));
+ response.render(OnDomReadyHeaderItem.forScript(String.format( "onedev.server.issueDetail.onDomReady('%s');", KEY_SCROLL_TOP)));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailResourceReference.java
new file mode 100644
index 0000000000..7e92b6429a
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailResourceReference.java
@@ -0,0 +1,27 @@
+package io.onedev.server.web.page.project.issues.detail;
+
+import java.util.List;
+
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.HeaderItem;
+
+import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
+import io.onedev.server.web.page.base.BaseDependentResourceReference;
+
+public class IssueDetailResourceReference extends BaseDependentResourceReference {
+
+ private static final long serialVersionUID = 1L;
+
+ public IssueDetailResourceReference() {
+ super(IssueDetailResourceReference.class, "issue-detail.js");
+ }
+
+ @Override
+ public List<HeaderItem> getDependencies() {
+ var dependencies = super.getDependencies();
+ dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(
+ IssueDetailResourceReference.class, "issue-detail.css")));
+ return dependencies;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssuePullRequestsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssuePullRequestsPage.html
new file mode 100644
index 0000000000..3745a70d99
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssuePullRequestsPage.html
@@ -0,0 +1,3 @@
+<wicket:extend>
+ <div wicket:id="pullRequests"></div>
+</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssuePullRequestsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssuePullRequestsPage.java
new file mode 100644
index 0000000000..99952e95d8
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssuePullRequestsPage.java
@@ -0,0 +1,19 @@
+package io.onedev.server.web.page.project.issues.detail;
+
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import io.onedev.server.web.component.issue.pullrequests.IssuePullRequestsPanel;
+
+public class IssuePullRequestsPage extends IssueDetailPage {
+
+ public IssuePullRequestsPage(PageParameters params) {
+ super(params);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new IssuePullRequestsPanel("pullRequests", issueModel));
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/issue-detail.js b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/issue-detail.js
new file mode 100644
index 0000000000..00115911bc
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/issue-detail.js
@@ -0,0 +1,9 @@
+onedev.server.issueDetail = {
+ onDomReady: function(scrollTopKey) {
+ var scrollTop = localStorage.getItem(scrollTopKey);
+ if (scrollTop) {
+ $(".issue-detail").closest(".autofit").scrollTop(parseInt(scrollTop));
+ localStorage.removeItem(scrollTopKey);
+ }
+ }
+};
\ No newline at end of file
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 6b9e941369..ad76b18135 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
@@ -24,6 +24,7 @@ import javax.validation.ValidationException;
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.Component;
+import org.apache.wicket.Page;
import org.apache.wicket.RestartResponseException;
import org.apache.wicket.Session;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -54,9 +55,7 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
-import org.apache.wicket.request.IRequestHandler;
-import org.apache.wicket.request.Url;
-import org.apache.wicket.request.cycle.IRequestCycleListener;
+import org.apache.wicket.request.cycle.AbstractRequestCycleListener;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.flow.RedirectToUrlException;
import org.apache.wicket.request.mapper.parameter.PageParameters;
@@ -135,6 +134,7 @@ import io.onedev.server.web.component.pullrequest.review.ReviewListPanel;
import io.onedev.server.web.component.sideinfo.SideInfoLink;
import io.onedev.server.web.component.sideinfo.SideInfoPanel;
import io.onedev.server.web.component.tabbable.PageTab;
+import io.onedev.server.web.component.tabbable.PageTabHead;
import io.onedev.server.web.component.tabbable.Tab;
import io.onedev.server.web.component.tabbable.Tabbable;
import io.onedev.server.web.component.user.ident.Mode;
@@ -166,6 +166,8 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
public static final String PARAM_REQUEST = "request";
+ private static final String KEY_SCROLL_TOP = "onedev.pullRequest.scrollTop";
+
protected final IModel<PullRequest> requestModel;
private boolean isEditingTitle;
@@ -802,6 +804,18 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
tabs.add(new PageTab(Model.of("Activities"), PullRequestActivitiesPage.class, PullRequestActivitiesPage.paramsOf(getPullRequest())) {
+ @Override
+ public Component render(String componentId) {
+ return new PageTabHead(componentId, this) {
+
+ @Override
+ protected Link<?> newLink(String componentId, Class<? extends Page> pageClass, PageParameters pageParams) {
+ return new ViewStateAwarePageLink<Void>(componentId, pageClass, pageParams, KEY_SCROLL_TOP);
+ }
+
+ };
+ }
+
@Override
protected Component renderOptions(String componentId) {
PullRequestActivitiesPage page = (PullRequestActivitiesPage) getPage();
@@ -809,7 +823,21 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
}
});
- tabs.add(new PageTab(Model.of("File Changes"), PullRequestChangesPage.class, PullRequestChangesPage.paramsOf(getPullRequest())));
+ tabs.add(new PageTab(Model.of("File Changes"), PullRequestChangesPage.class, PullRequestChangesPage.paramsOf(getPullRequest())) {
+
+ @Override
+ public Component render(String componentId) {
+ return new PageTabHead(componentId, this) {
+
+ @Override
+ protected Link<?> newLink(String componentId, Class<? extends Page> pageClass, PageParameters pageParams) {
+ return new ViewStateAwarePageLink<Void>(componentId, pageClass, pageParams, KEY_SCROLL_TOP);
+ }
+
+ };
+ }
+
+ });
tabs.add(new PageTab(Model.of("Code Comments"), PullRequestCodeCommentsPage.class, PullRequestCodeCommentsPage.paramsOf(getPullRequest())) {
@Override
public Component render(String componentId) {
@@ -820,7 +848,8 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
// resolved issues
Link<Void> link = new ViewStateAwarePageLink<Void>("link",
PullRequestCodeCommentsPage.class,
- PullRequestCodeCommentsPage.paramsOf(getPullRequest()));
+ PullRequestCodeCommentsPage.paramsOf(getPullRequest()),
+ KEY_SCROLL_TOP);
link.add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {
@Override
protected String load() {
@@ -848,32 +877,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
add(new Tabbable("requestTabs", tabs).setOutputMarkupId(true));
- RequestCycle.get().getListeners().add(new IRequestCycleListener() {
-
- @Override
- public void onUrlMapped(RequestCycle cycle, IRequestHandler handler, Url url) {
- }
-
- @Override
- public void onRequestHandlerScheduled(RequestCycle cycle, IRequestHandler handler) {
- }
-
- @Override
- public void onRequestHandlerResolved(RequestCycle cycle, IRequestHandler handler) {
- }
-
- @Override
- public void onRequestHandlerExecuted(RequestCycle cycle, IRequestHandler handler) {
- }
-
- @Override
- public void onExceptionRequestHandlerResolved(RequestCycle cycle, IRequestHandler handler, Exception exception) {
- }
-
- @Override
- public IRequestHandler onException(RequestCycle cycle, Exception ex) {
- return null;
- }
+ RequestCycle.get().getListeners().add(new AbstractRequestCycleListener() {
@Override
public void onEndRequest(RequestCycle cycle) {
@@ -881,14 +885,6 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
OneDev.getInstance(VisitInfoManager.class).visitPullRequest(SecurityUtils.getAuthUser(), getPullRequest());
}
- @Override
- public void onDetach(RequestCycle cycle) {
- }
-
- @Override
- public void onBeginRequest(RequestCycle cycle) {
- }
-
});
}
@@ -2261,7 +2257,8 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
- response.render(JavaScriptHeaderItem.forReference(new PullRequestDetailResourceReference()));
+ response.render(JavaScriptHeaderItem.forReference(new PullRequestDetailResourceReference()));
+ response.render(OnDomReadyHeaderItem.forScript(String.format( "onedev.server.pullRequestDetail.onDomReady('%s');", KEY_SCROLL_TOP)));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.js b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.js
index 8c047b6e9a..5cd4a3e4b6 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.js
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.js
@@ -1,4 +1,11 @@
onedev.server.pullRequestDetail = {
+ onDomReady: function(scrollTopKey) {
+ var scrollTop = localStorage.getItem(scrollTopKey);
+ if (scrollTop) {
+ $(".pull-request-detail").closest(".autofit").scrollTop(parseInt(scrollTop));
+ localStorage.removeItem(scrollTopKey);
+ }
+ },
onSummaryDomReady: function() {
$(".pull-request-detail .card-body .main .more-info").click(function() {
$(".pull-request-detail .card-header .side-info").click();
diff --git a/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh_CN.java b/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh_CN.java
index 6a52256707..f7683e0bb4 100644
--- a/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh_CN.java
+++ b/server-core/src/main/java/io/onedev/server/web/translation/Translation_zh_CN.java
@@ -87,7 +87,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("All platforms in image", "所有镜像中的平台");
m.put("All projects", "所有项目");
m.put("All projects with code read permission", "所有具有代码读取权限的项目");
- m.put("All pull requests", "所有拉取请求");
+ m.put("All pull requests", "所有合并请求");
m.put("All users", "所有用户");
m.put("Allow Empty", "允许为空");
m.put("Allow Empty Value", "允许空值");
@@ -121,7 +121,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Applicable Jobs", "适用任务");
m.put("Applicable Names", "适用名称");
m.put("Applicable Projects", "适用项目");
- m.put("Applicable Pull Requests", "适用拉取请求");
+ m.put("Applicable Pull Requests", "适用合并请求");
m.put("Applicable Senders", "适用发送者");
m.put("Applicable Users", "适用用户");
m.put("Application (client) ID", "应用(客户端)ID");
@@ -234,8 +234,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Build is successful", "构建成功");
m.put("Build list", "构建列表");
m.put("Build number", "构建编号");
- m.put("Build required for deletion. Submit pull request instead", "需要构建才能删除。请提交拉取请求");
- m.put("Build required for this change. Submit pull request instead", "需要构建才能更改。请提交拉取请求");
+ m.put("Build required for deletion. Submit pull request instead", "需要构建才能删除。请提交合并请求");
+ m.put("Build required for this change. Submit pull request instead", "需要构建才能更改。请提交合并请求");
m.put("Build version", "构建版本");
m.put("Build with Persistent Volume", "使用持久卷构建");
m.put("Builds", "构建");
@@ -513,11 +513,11 @@ public class Translation_zh_CN extends TranslationResourceBundle {
"启用此选项以允许运行站点发布步骤。OneDev 将按原样提供项目站点文件。为避免 XSS 攻击,请确保此执行器只能由受信任的任务使用");
m.put("Enable this to place intermediate files required by job execution on dynamically allocated persistent volume instead of emptyDir",
"启用此选项以将任务执行所需的中间文件放置在动态分配的持久卷而不是 emptyDir 中");
- m.put("Enable this to process issue or pull request comments posted via email", "启用此选项以处理通过电子邮件发布的工单或拉取请求评论");
+ m.put("Enable this to process issue or pull request comments posted via email", "启用此选项以处理通过电子邮件发布的工单或合并请求评论");
m.put("Enable this to process issue or pull request comments posted via email. <b class='text-danger'>NOTE:</b> <a href='https://docs.microsoft.com/en-us/exchange/recipients-in-exchange-online/plus-addressing-in-exchange-online' target='_blank'>Sub addressing</a> needs to be enabled for system email address above, as OneDev uses it to track issue and pull request contexts",
- "启用此选项以处理通过电子邮件发布的工单或拉取请求评论。<b class='text-danger'>注意:</b> <a href='https://en.wikipedia.org/wiki/Email_address#Subaddressing' target='_blank'>Sub addressing</a> 需要为系统电子邮件地址启用,因为 OneDev 使用它来跟踪工单和拉取请求上下文");
+ "启用此选项以处理通过电子邮件发布的工单或合并请求评论。<b class='text-danger'>注意:</b> <a href='https://en.wikipedia.org/wiki/Email_address#Subaddressing' target='_blank'>Sub addressing</a> 需要为系统电子邮件地址启用,因为 OneDev 使用它来跟踪工单和合并请求上下文");
m.put("Enable this to process issue or pull request comments posted via email. <b class='text-danger'>NOTE:</b> <a href='https://en.wikipedia.org/wiki/Email_address#Subaddressing' target='_blank'>Sub addressing</a> needs to be enabled for system email address above, as OneDev uses it to track issue and pull request contexts",
- "启用此选项以处理通过电子邮件发布的工单或拉取请求评论。<b class='text-danger'>注意:</b> <a href='https://en.wikipedia.org/wiki/Email_address#Subaddressing' target='_blank'>子地址</a> 需要为上述系统电子邮件地址启用,因为 OneDev 使用它来跟踪工单和拉取请求上下文");
+ "启用此选项以处理通过电子邮件发布的工单或合并请求评论。<b class='text-danger'>注意:</b> <a href='https://en.wikipedia.org/wiki/Email_address#Subaddressing' target='_blank'>子地址</a> 需要为上述系统电子邮件地址启用,因为 OneDev 使用它来跟踪工单和合并请求上下文");
m.put("Enable to allow to upload build cache generated during CI/CD job. Uploaded cache can be used by subsequent builds of the project as long as cache key matches",
"启用此选项以允许上传在 CI/CD 任务期间生成的构建缓存。上传的缓存可以被项目后续的构建使用,只要缓存密钥匹配");
m.put("Enforce Conventional Commits", "强制执行 Conventional Commits");
@@ -706,7 +706,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Id", "ID");
m.put("Identify Field", "识别字段");
m.put("If enabled, source branch will be deleted automatically after merge the pull request if user has permission to do that",
- "如果启用,在用户有权限的情况下,源分支将在合并拉取请求后自动删除");
+ "如果启用,在用户有权限的情况下,源分支将在合并合并请求后自动删除");
m.put("If specified, OneDev will only display iterations with this prefix", "如果指定,OneDev 将只显示具有此前缀的迭代");
m.put("If specified, all public and internal projects imported from GitLab will use this as default role. Private projects are not affected",
"如果指定,所有从 GitLab 导入的公共和内部项目将使用此作为默认角色。私有项目不受影响");
@@ -997,8 +997,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Named Pack Query", "命名包查询");
m.put("Named Project Queries Bean", "命名项目查询Bean");
m.put("Named Project Query", "命名项目查询");
- m.put("Named Pull Request Queries Bean", "命名拉取请求查询Bean");
- m.put("Named Pull Request Query", "命名拉取请求查询");
+ m.put("Named Pull Request Queries Bean", "命名合并请求查询Bean");
+ m.put("Named Pull Request Query", "命名合并请求查询");
m.put("Named Query", "命名查询");
m.put("Network Options", "网络选项");
m.put("Never expire", "永不过期");
@@ -1061,7 +1061,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Notify Code Push Events", "通知代码推送事件");
m.put("Notify Issue Events", "通知工单事件");
m.put("Notify Own Events", "通知自己");
- m.put("Notify Pull Request Events", "通知拉取请求");
+ m.put("Notify Pull Request Events", "通知合并请求");
m.put("Notify Users", "通知用户");
m.put("Ntfy.sh Notifications", "Ntfy.sh 通知");
m.put("Number of CPU Cores", "CPU 核心数");
@@ -1109,7 +1109,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Optionally configure proxy to access remote repository. Proxy should be in the format of &lt;proxy host&gt;:&lt;proxy port&gt;",
"可选择为访问远程仓库配置代理。代理应为 <i>&lt;代理主机&gt;:&lt;代理端口&gt;</i> 格式");
m.put("Optionally define a unique key for the project with two or more upper case letters. This key can be used to reference issues, builds, and pull requests with a stable and short form <code>&lt;project key&gt;-&lt;number&gt;</code> instead of <code>&lt;project path&gt;#&lt;number&gt;</code>",
- "可选择为项目定义一个唯一的键,该键由两个或更多大写字母组成。此键可用于引用工单、构建和拉取请求,使用稳定的短格式 <code>&lt;project key&gt;-&lt;number&gt;</code> 代替 <code>&lt;project path&gt;#&lt;number&gt;</code>");
+ "可选择为项目定义一个唯一的键,该键由两个或更多大写字母组成。此键可用于引用工单、构建和合并请求,使用稳定的短格式 <code>&lt;project key&gt;-&lt;number&gt;</code> 代替 <code>&lt;project path&gt;#&lt;number&gt;</code>");
m.put("Optionally define parameter specifications of the job", "可选择为任务定义参数");
m.put("Optionally define parameter specifications of the step template", "可选择为步骤模板定义参数");
m.put("Optionally describe the group", "可选择描述组");
@@ -1117,7 +1117,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Optionally describes the param. Html tags are accepted.", "可选择描述参数。接受 HTML 标签");
m.put("Optionally filter builds", "可选择过滤构建");
m.put("Optionally filter issues", "可选择过滤工单");
- m.put("Optionally filter pull requests", "可选择过滤拉取请求");
+ m.put("Optionally filter pull requests", "可选择过滤合并请求");
m.put("Optionally leave a note", "可选择留一个备注");
m.put("Optionally mount directories or files under job workspace into container", "可选择将任务工作空间下的目录或文件挂载到容器中");
m.put("Optionally select fields to prompt when this button is pressed", "可选择在点击此按钮时提示字段");
@@ -1185,7 +1185,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
"可选择指定允许按此按钮的授权角色。如果未指定,则允许所有用户");
m.put("Optionally specify base query of the list", "可选择指定列表的基本查询");
m.put("Optionally specify branches/users/groups allowed to access this secret. If left empty, any job can access this secret, including those triggered via external pull requests",
- "可选择指定允许访问此密钥的分支/用户/组。如果留空,任何任务都可以访问此密钥,包括通过外部拉取请求触发的任务");
+ "可选择指定允许访问此密钥的分支/用户/组。如果留空,任何任务都可以访问此密钥,包括通过外部合并请求触发的任务");
m.put("Optionally specify build context path relative to <a href='https://docs.onedev.io/concepts#job-workspace' target='_blank'>job workspace</a>. Leave empty to use job workspace itself. The file <code>Dockerfile</code> is expected to exist in build context directory, unless you specify a different location with option <code>--dockerfile</code>",
"可选择指定相对于 <a href='https://docs.onedev.io/concepts#job-workspace' target='_blank'>任务工作空间</a> 的构建上下文路径。留空则使用任务工作空间本身。除非使用选项 <code>--dockerfile</code> 指定不同位置,否则文件 <code>Dockerfile</code> 应存在于构建上下文目录中");
m.put("Optionally specify build path relative to <a href='https://docs.onedev.io/concepts#job-workspace' target='_blank'>job workspace</a>. Leave empty to use job workspace itself",
@@ -1236,7 +1236,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Optionally specify memory limit of each job/service using this executor. This will be used as option <a href='https://docs.docker.com/config/containers/resource_constraints/#memory' target='_blank'>--memory</a> of relevant containers",
"可选择为使用此执行器的每个任务/服务指定内存限制。这将用作相关容器的选项 <a href='https://docs.docker.com/config/containers/resource_constraints/#memory' target='_blank'>--memory</a>");
m.put("Optionally specify merge strategy of created pull request. Leave empty to use default strategy of each project",
- "可选择指定创建的拉取请求的合并策略。留空则使用每个项目的默认策略");
+ "可选择指定创建的合并请求的合并策略。留空则使用每个项目的默认策略");
m.put("Optionally specify message of the tag", "可选择指定标签的消息");
m.put("Optionally specify name of the attribute inside the user LDAP entry whose values will be taken as user SSH keys. SSH keys will be managed by LDAP only if this field is set",
"可选择指定用户 LDAP 条目中属性的名称,其值将被用作用户 SSH 密钥。只有设置了此字段,SSH 密钥才会由 LDAP 管理");
@@ -1309,7 +1309,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Optionally specify space-separated tags to check. Use '**', '*' or '?' for <a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>path wildcard match</a>. Prefix with '-' to exclude. Leave empty to match all tags",
"可选择指定要检查的以空格分隔的标签。使用 '**'、'*' 或 '?' 进行 <a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>路径通配符匹配</a>。前缀 '-' 表示排除。留空则匹配所有标签");
m.put("Optionally specify space-separated target branches of the pull requests to check. Use '**', '*' or '?' for <a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>path wildcard match</a>. Prefix with '-' to exclude. Leave empty to match all branches",
- "可选择指定要检查的以空格分隔的拉取请求的目标分支。使用 '**'、'*' 或 '?' 进行 <a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>路径通配符匹配</a>。前缀 '-' 表示排除。留空则匹配所有分支");
+ "可选择指定要检查的以空格分隔的合并请求的目标分支。使用 '**'、'*' 或 '?' 进行 <a href='https://docs.onedev.io/appendix/path-wildcard' target='_blank'>路径通配符匹配</a>。前缀 '-' 表示排除。留空则匹配所有分支");
m.put("Optionally specify the OpenID claim to retrieve groups of authenticated user. Depending on the provider, you may need to request additional scopes above to make this claim available",
"可选择指定要检索已认证用户的组。根据提供商,您可能需要请求额外的范围以使此声明可用");
m.put("Optionally specify the maximum value allowed.", "可选择指定允许的最大值");
@@ -1416,7 +1416,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Previous", "上一步");
m.put("Primary", "主");
m.put("Primary or alias email address of above account to be used as sender address of various email notifications. User can also reply to this address to post issue or pull request comments via email if <code>Check Incoming Email</code> option is enabled below",
- "主或别名邮箱地址作为各种电子邮件通知的发件人地址。如果启用了 <code>Check Incoming Email</code> 选项,用户也可以回复此地址通过电子邮件发布问题或拉取请求评论");
+ "主或别名邮箱地址作为各种电子邮件通知的发件人地址。如果启用了 <code>Check Incoming Email</code> 选项,用户也可以回复此地址通过电子邮件发布问题或合并请求评论");
m.put("Principal name of the account to login into office 365 mail server to send/receive emails. Make sure this account <b>owns</b> the registered application indicated by application id above",
"登录到 office 365 邮件服务器发送/接收电子邮件的帐户的主名称。确保此帐户 <b>拥有</b> 上述应用程序 ID 指示的注册应用程序");
m.put("Private Key Secret", "私钥密钥");
@@ -1435,7 +1435,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Project Management", "项目管理");
m.put("Project Pack Setting", "项目打包设置");
m.put("Project Path", "项目路径");
- m.put("Project Pull Request Setting", "项目拉取请求设置");
+ m.put("Project Pull Request Setting", "项目合并请求设置");
m.put("Project does not have any code yet", "项目还没有代码");
m.put("Project id", "项目 ID");
m.put("Project list", "项目列表");
@@ -1457,29 +1457,29 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Publish Report Step", "发布报告步骤");
m.put("Publish Unit Test Report Step", "发布单元测试报告步骤");
m.put("Pull Image", "拉取镜像");
- m.put("Pull Request", "拉取请求");
- m.put("Pull Request Filter", "拉取请求过滤");
- m.put("Pull Request Management", "拉取请求管理");
- m.put("Pull Request Markdown Report", "拉取请求 Markdown 报告");
- m.put("Pull Request Notification", "拉取请求通知");
- m.put("Pull Request Notification Unsubscribed", "拉取请求通知退订");
- m.put("Pull Requests", "拉取请求");
+ m.put("Pull Request", "合并请求");
+ m.put("Pull Request Filter", "合并请求过滤");
+ m.put("Pull Request Management", "合并请求管理");
+ m.put("Pull Request Markdown Report", "合并请求 Markdown 报告");
+ m.put("Pull Request Notification", "合并请求通知");
+ m.put("Pull Request Notification Unsubscribed", "合并请求通知退订");
+ m.put("Pull Requests", "合并请求");
m.put("Pull docker image as OCI layout via crane. This step needs to be executed by server docker executor, remote docker executor, or Kubernetes executor",
"此步骤需要由服务器 docker 执行器、远程 docker 执行器或 Kubernetes 执行器执行");
m.put("Pull from Remote", "从远程拉取");
- m.put("Pull request", "拉取请求");
+ m.put("Pull request", "合并请求");
m.put("Pull request administrative permission inside a project, including batch operations over multiple pull requests",
- "在项目中对多个拉取请求进行批量操作的权限");
- m.put("Pull request discard", "拉取请求丢弃");
- m.put("Pull request duration statistics", "拉取请求持续时间统计");
- m.put("Pull request frequency statistics", "拉取请求频率统计");
- m.put("Pull request is discarded", "拉取请求被丢弃");
- m.put("Pull request is merged", "拉取请求被合并");
- m.put("Pull request is opened", "拉取请求被打开");
- m.put("Pull request list", "拉取请求列表");
- m.put("Pull request merge", "拉取请求合并");
- m.put("Pull request number", "拉取请求编号");
- m.put("Pull request open or update", "拉取请求打开或更新");
+ "在项目中对多个合并请求进行批量操作的权限");
+ m.put("Pull request discard", "合并请求丢弃");
+ m.put("Pull request duration statistics", "合并请求持续时间统计");
+ m.put("Pull request frequency statistics", "合并请求频率统计");
+ m.put("Pull request is discarded", "合并请求被丢弃");
+ m.put("Pull request is merged", "合并请求被合并");
+ m.put("Pull request is opened", "合并请求被打开");
+ m.put("Pull request list", "合并请求列表");
+ m.put("Pull request merge", "合并请求合并");
+ m.put("Pull request number", "合并请求编号");
+ m.put("Pull request open or update", "合并请求打开或更新");
m.put("Push Image", "推送镜像");
m.put("Push docker image from OCI layout via crane. This step needs to be executed by server docker executor, remote docker executor, or Kubernetes executor",
"此步骤需要由服务器 docker 执行器、远程 docker 执行器或 Kubernetes 执行器执行");
@@ -1529,7 +1529,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Request Scopes", "请求范围");
m.put("Requested for changes", "请求更改");
m.put("Require Autentication", "要求认证");
- m.put("Require Strict Pull Request Builds", "要求严格拉取请求构建");
+ m.put("Require Strict Pull Request Builds", "要求严格合并请求构建");
m.put("Require Successful", "要求成功");
m.put("Required Builds", "要求构建");
m.put("Required Reviewers", "要求审查者");
@@ -1540,8 +1540,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Retrieve Submodules", "检索子模块");
m.put("Retry Condition", "重试条件");
m.put("Retry Delay", "重试延迟");
- m.put("Review required for deletion. Submit pull request instead", "需要审查才能删除。请提交拉取请求");
- m.put("Review required for this change. Submit pull request instead", "需要审查才能更改。请提交拉取请求");
+ m.put("Review required for deletion. Submit pull request instead", "需要审查才能删除。请提交合并请求");
+ m.put("Review required for this change. Submit pull request instead", "需要审查才能更改。请提交合并请求");
m.put("Reviewers", "审查者");
m.put("Revision", "修订");
m.put("Revision indexing in progress...", "正在索引当前版本...");
@@ -1678,7 +1678,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Show Duration", "显示持续时间");
m.put("Show Issue Status", "显示问题状态");
m.put("Show Package Stats", "显示包统计");
- m.put("Show Pull Request Stats", "显示拉取请求统计");
+ m.put("Show Pull Request Stats", "显示合并请求统计");
m.put("Show Saved Queries", "显示保存的查询");
m.put("Show Works Of", "显示工作量");
m.put("Sign In", "登录");
@@ -1718,7 +1718,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Specify .net TRX test result file relative to <a href='https://docs.onedev.io/concepts#job-workspace'>job workspace</a>, for instance <tt>TestResults/*.trx</tt>. Use * or ? for pattern match",
"指定 .net TRX 测试结果文件相对 <a href='https://docs.onedev.io/concepts#job-workspace'>job workspace</a>,例如 <tt>TestResults/*.trx</tt>。使用 * 或 ? 进行模式匹配");
m.put("Specify <a href='https://docs.onedev.io/tutorials/cicd/job-secrets' target='_blank'>job secret</a> whose value is access token with code write permission over above projects. Commits, issues, and pull requests will also be created under name of the access token owner",
- "指定 <a href='https://docs.onedev.io/tutorials/cicd/job-secrets' target='_blank'>job secret</a> 的值是具有代码写入权限的访问令牌。提交、问题和拉取请求也将以访问令牌所有者的名义创建");
+ "指定 <a href='https://docs.onedev.io/tutorials/cicd/job-secrets' target='_blank'>job secret</a> 的值是具有代码写入权限的访问令牌。提交、问题和合并请求也将以访问令牌所有者的名义创建");
m.put("Specify <a href='https://github.com/rust-lang/rust-clippy'>rust clippy</a> json output file relative to <a href='https://docs.onedev.io/concepts#job-workspace'>job workspace</a>. This file can be generated with clippy json output option, for instance <code>cargo clippy --message-format json>check-result.json</code>. Use * or ? for pattern match",
"指定 <a href='https://github.com/rust-lang/rust-clippy'>rust clippy</a> json 输出文件相对 <a href='https://docs.onedev.io/concepts#job-workspace'>job workspace</a>。此文件可以通过 clippy json 输出选项生成,例如 <code>cargo clippy --message-format json>check-result.json</code>。使用 * 或 ? 进行模式匹配");
m.put("Specify CPD result xml file relative to <a href='https://docs.onedev.io/concepts#job-workspace'>job workspace</a>, for instance, <tt>target/cpd.xml</tt>. Use * or ? for pattern match",
@@ -1858,8 +1858,8 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Specify cpu request for each job/service using this executor. Check <a href='https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' target='_blank'>Kubernetes resource management</a> for details",
"指定使用此执行器的每个任务/服务的 CPU 请求。查看 <a href='https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' target='_blank'>Kubernetes 资源管理</a> 了解详情");
m.put("Specify default assignees of pull requests submitted to this project. Only users with the write code permission to the project can be selected",
- "指定提交到此项目的拉取请求的默认受理人。只能选择具有项目写代码权限的用户");
- m.put("Specify default merge strategy of pull requests submitted to this project", "指定提交到此项目的拉取请求的默认合并策略");
+ "指定提交到此项目的合并请求的默认受理人。只能选择具有项目写代码权限的用户");
+ m.put("Specify default merge strategy of pull requests submitted to this project", "指定提交到此项目的合并请求的默认合并策略");
m.put("Specify destinations, for instance <tt>registry-server:5000/myorg/myrepo:latest</tt>. Make sure to use <b>same host</b> as specified in server url of system settings if you want to push to built-in registry, or simply use the form <tt>@server@/&lt;project path&gt;/&lt;repo name&gt;:&lt;tag name&gt;</tt>. Multiple destinations should be separated with space",
"指定目标,例如 <tt>registry-server:5000/myorg/myrepo:latest</tt>。如果要推送到内置注册表,请确保使用与系统设置中服务器 URL 指定的<b>相同主机</b>,或者简单地使用格式 <tt>@server@/&lt;项目路径&gt;/&lt;仓库名称&gt;:&lt;标签名称&gt;</tt>。多个目标应以空格分隔");
m.put("Specify directory (tenant) ID of the app registered in Entra ID", "指定在 Entra ID 中注册的应用程序的目录(租户)ID");
@@ -2117,9 +2117,9 @@ public class Translation_zh_CN extends TranslationResourceBundle {
"此 <span wicket:id=\"elementTypeName\"></span> 是从 <a wicket:id=\"link\" class=\"alert-link\"><span wicket:id=\"label\"></span></a> 导入的");
m.put("This account is disabled", "此账户已禁用");
m.put("This address should be <code>verified sender</code> in SendGrid and will be used as sender address of various email notifications. One can also reply to this address to post issue or pull request comments if <code>Receive Posted Email</code> option is enabled below",
- "此地址应在 SendGrid 中为 <code>已验证的发送者</code>,将用作各种电子邮件通知的发送者地址。如果下面启用了 <code>接收已发布电子邮件</code> 选项,用户也可以回复此地址以发布工单或拉取请求评论");
+ "此地址应在 SendGrid 中为 <code>已验证的发送者</code>,将用作各种电子邮件通知的发送者地址。如果下面启用了 <code>接收已发布电子邮件</code> 选项,用户也可以回复此地址以发布工单或合并请求评论");
m.put("This address will be used as sender address of various email notifications. User can also reply to this address to post issue or pull request comments via email if <code>Check Incoming Email</code> option is enabled below",
- "此地址将用作各种电子邮件通知的发送者地址。如果下面启用了 <code>检查接收电子邮件</code> 选项,用户也可以通过电子邮件回复此地址以发布工单或拉取请求评论");
+ "此地址将用作各种电子邮件通知的发送者地址。如果下面启用了 <code>检查接收电子邮件</code> 选项,用户也可以通过电子邮件回复此地址以发布工单或合并请求评论");
m.put("This executor runs build jobs as docker containers on OneDev server", "此执行器在 OneDev 服务器上以 Docker 容器运行构建任务");
m.put("This executor runs build jobs as docker containers on remote machines via <a href='/~administration/agents' target='_blank'>agents</a>",
"此执行器通过 <a href='/~administration/agents' target='_blank'>代理</a> 在远程机器上以 Docker 容器运行构建任务");
@@ -2143,7 +2143,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("This permission enables one to schedule issues into iterations", "此权限允许将工单调度到迭代中");
m.put("This property is imported from {0}", "此属性是从 {0} 导入的");
m.put("This report will be displayed in pull request overview page if build is triggered by pull request",
- "如果构建由拉取请求触发,此报告将显示在拉取请求概览页面中");
+ "如果构建由合并请求触发,此报告将显示在合并请求概览页面中");
m.put("This step can only be executed by a docker aware executor", "此步骤只能由支持 Docker 的执行器执行");
m.put("This step can only be executed by a docker aware executor. It runs under <a href='https://docs.onedev.io/concepts#job-workspace' target='_blank'>job workspace</a>",
"此步骤只能由支持 Docker 的执行器执行。它在 <a href='https://docs.onedev.io/concepts#job-workspace' target='_blank'>任务工作空间</a> 下运行");
@@ -2275,7 +2275,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Week", "周");
m.put("When", "何时");
m.put("When target branch of a pull request has new commits, merge commit of the pull request will be recalculated, and this option tells whether or not to accept pull request builds ran on previous merged commit. If enabled, you will need to re-run required builds on the new merge commit. This setting takes effect only when required builds are specified",
- "当拉取请求的目标分支有新提交时,拉取请求的合并提交将被重新计算,此选项决定是否接受在之前合并提交上运行的拉取请求构建。如果启用,您需要在新的合并提交上重新运行所需的构建。此设置仅在指定了所需构建时生效");
+ "当合并请求的目标分支有新提交时,合并请求的合并提交将被重新计算,此选项决定是否接受在之前合并提交上运行的合并请求构建。如果启用,您需要在新的合并提交上重新运行所需的构建。此设置仅在指定了所需构建时生效");
m.put("When this work starts", "此工作开始时");
m.put("Whether or not created issue should be confidential", "创建的工单是否应为机密");
m.put("Whether or not multiple issues can be linked", "是否可以链接多个工单");
@@ -2372,7 +2372,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("new field", "新字段");
m.put("outdated", "过时");
m.put("packages", "包");
- m.put("pull requests", "拉取请求");
+ m.put("pull requests", "合并请求");
m.put("root", "根");
m.put("search in this revision will be accurate after indexed", "索引完成后,在当前版本中的搜索将更准确");
m.put("submit", "提交");
@@ -2391,7 +2391,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Calculating merge preview...", "计算合并预览...");
m.put("Comment", "评论");
m.put("Comment too long", "评论过长");
- m.put("Create Pull Request", "创建拉取请求");
+ m.put("Create Pull Request", "创建合并请求");
m.put("Description too long", "描述过长");
m.put("Do you really want to delete this email address?", "您真的要删除这个电子邮件地址吗?");
m.put("Email address", "电子邮件地址");
@@ -2413,7 +2413,7 @@ public class Translation_zh_CN extends TranslationResourceBundle {
m.put("Set As Primary", "设置为主");
m.put("Some one changed the content you are editing. Reload the page and try again.", "有人修改了您正在编辑的内容。重新加载页面并重试。");
m.put("Symbol name", "符号名称");
- m.put("There are merge conflicts. You can still create the pull request though", "有合并冲突。您仍然可以创建拉取请求");
+ m.put("There are merge conflicts. You can still create the pull request though", "有合并冲突。您仍然可以创建合并请求");
m.put("This email address is being used", "此电子邮件地址正在使用");
m.put("This field is required", "此字段是必填的");
m.put("Unable to send verification email as mail service is not configured yet", "无法发送验证电子邮件,因为邮件服务未配置");
diff --git a/server-ee b/server-ee
index d8ffe6e5b6..7e647a3fe2 160000
--- a/server-ee
+++ b/server-ee
@@ -1 +1 @@
-Subproject commit d8ffe6e5b678c787ecbcd08036eeaf684fd6f94a
+Subproject commit 7e647a3fe21ff84d051bf04b34ac82ba652475f6