The Unified and Autonomous Development Platform
Refactor issue detail page to show pull requests and commits explicitly
Robin Shen83fc3bb4d9c8
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsCssResourceReference.java b/core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsCssResourceReference.javanew file mode 100644index 0000000000..0e2cd2843b--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsCssResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.component.issue.commits;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class IssueCommitsCssResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public IssueCommitsCssResourceReference() {+ super(IssueCommitsCssResourceReference.class, "issue-commits.css");+ }++}diff --git a/core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.html b/core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.htmlnew file mode 100644index 0000000000..077a78f6c0--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.html@@ -0,0 +1,14 @@+<wicket:panel>+ <div class="issue-commits">+ <div class="head">Commits</div>+ <div class="body">+ <div wicket:id="commits" class="commit clearfix">+ <a wicket:id="message" class="pull-left"><span wicket:id="label"></span></a>+ <div class="pull-right">+ <a wicket:id="hash" class="hash"><span wicket:id="label"></span></a>+ <a wicket:id="copyHash" class="copy"><i class="fa fa-clipboard"></i></a>+ </div>+ </div>+ </div>+ </div>+</wicket:panel>diff --git a/core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.javanew file mode 100644index 0000000000..2174f1549f--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.java@@ -0,0 +1,84 @@+package io.onedev.server.web.component.issue.commits;++import java.util.List;++import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.markup.html.list.ListItem;+import org.apache.wicket.markup.html.list.ListView;+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.mapper.parameter.PageParameters;+import org.eclipse.jgit.revwalk.RevCommit;++import io.onedev.server.git.GitUtils;+import io.onedev.server.model.Issue;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;+import io.onedev.server.web.component.link.ViewStateAwarePageLink;+import io.onedev.server.web.page.project.commits.CommitDetailPage;++@SuppressWarnings("serial")+public class IssueCommitsPanel extends GenericPanel<Issue> {++ public IssueCommitsPanel(String id, IModel<Issue> model) {+ super(id, model);+ }++ @Override+ public void onInitialize() {+ super.onInitialize();++ add(new ListView<RevCommit>("commits", new AbstractReadOnlyModel<List<RevCommit>>() {++ @Override+ public List<RevCommit> getObject() {+ return getIssue().getCommits();+ }++ }) {++ @Override+ protected void populateItem(ListItem<RevCommit> item) {+ RevCommit commit = item.getModelObject();+ CommitDetailPage.State commitState = new CommitDetailPage.State();+ commitState.revision = commit.name();+ PageParameters params = CommitDetailPage.paramsOf(getIssue().getProject(), commitState);++ Link<Void> messageLink = new ViewStateAwarePageLink<Void>("message", CommitDetailPage.class, params);+ messageLink.add(new Label("label", commit.getShortMessage()));+ item.add(messageLink);++ Link<Void> hashLink = new ViewStateAwarePageLink<Void>("hash", CommitDetailPage.class, params);+ hashLink.add(new Label("label", GitUtils.abbreviateSHA(commit.name())));+ item.add(hashLink);+ item.add(new WebMarkupContainer("copyHash").add(new CopyClipboardBehavior(Model.of(commit.name()))));+ }++ });++ }++ private Issue getIssue() {+ return getModelObject();+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.canReadCode(getIssue().getProject().getFacade())+ && !getIssue().getCommits().isEmpty());+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new IssueCommitsCssResourceReference()));+ }++}diff --git a/core/src/main/java/io/onedev/server/web/component/issue/commits/issue-commits.css b/core/src/main/java/io/onedev/server/web/component/issue/commits/issue-commits.cssnew file mode 100644index 0000000000..f9bb79c5ea--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/issue/commits/issue-commits.css@@ -0,0 +1,11 @@+.issue-commits {+ border-top: 1px solid #E8E8E8;+ padding-top: 12px;+}+.issue-commits>.head {+ font-weight: bold;+ margin-bottom: 8px;+}+.issue-commits>.body .commit {+ margin-bottom: 6px;+}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.html b/core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.htmlindex 099d88b907..c7bfa2289f 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.html+++ b/core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.html@@ -6,7 +6,7 @@<a wicket:id="transitions" class="btn btn-default btn-sm pull-left"><span wicket:id="label"></span></a></wicket:enclosure><a wicket:id="newIssue" class="new-issue pull-left btn btn-success btn-sm"><i class="fa fa-plus"></i> New Issue</a>- <a wicket:id="moreInfo" class="more-info" title="More info"><span class="glyphicon glyphicon-open"></span></a>+ <a wicket:id="moreInfo" class="more-info" title="More info"><i class="fa fa-ellipsis-h"></i></a></div><div wicket:id="actionOptions" class="action-options"></div></div>diff --git a/core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.html b/core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.htmlindex a6303583e6..29f02b8349 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.html+++ b/core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.html@@ -1,9 +1,11 @@<wicket:panel>- <table wicket:id="requests" class="table issue-pull-requests"></table>- <div class="help-block">- <i class="fa fa-info-circle"></i> This page lists pull requests containing recent commits fixing the issue- </div>- <wicket:fragment wicket:id="sourceFrag">- <a wicket:id="link"></a>- </wicket:fragment>-</wicket:panel>\ No newline at end of file+ <div class="issue-pull-requests">+ <div class="head">Pull Requests</div>+ <div class="body">+ <div wicket:id="pullRequests" class="pull-request clearfix">+ <a wicket:id="title" class="pull-left title"><span wicket:id="label"></span></a>+ <span wicket:id="status" class="pull-right"></span>+ </div>+ </div>+ </div>+</wicket:panel>diff --git a/core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.javaindex bcc342d59b..571e4d386c 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.java@@ -5,25 +5,19 @@ import java.util.Collection;import java.util.Collections;import java.util.Comparator;import java.util.HashSet;-import java.util.Iterator;import java.util.List;-import org.apache.wicket.extensions.ajax.markup.html.repeater.data.table.AjaxFallbackHeadersToolbar;-import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;-import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;-import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;-import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;-import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;-import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;+import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.markup.repeater.Item;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.markup.html.list.ListItem;+import org.apache.wicket.markup.html.list.ListView;+import org.apache.wicket.markup.html.panel.GenericPanel;import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;import org.eclipse.jgit.lib.ObjectId;import io.onedev.server.OneDev;@@ -32,20 +26,19 @@ import io.onedev.server.cache.CommitInfoManager;import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.model.Issue;import io.onedev.server.model.PullRequest;-import io.onedev.server.util.DateUtils;-import io.onedev.server.web.component.branch.BranchLink;-import io.onedev.server.web.component.datatable.LoadableDetachableDataProvider;-import io.onedev.server.web.component.pullrequest.summary.PullRequestSummaryPanel;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.web.component.pullrequest.RequestStatusLabel;+import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;@SuppressWarnings("serial")-public abstract class IssuePullRequestsPanel extends Panel {+public class IssuePullRequestsPanel extends GenericPanel<Issue> {private final IModel<List<PullRequest>> requestsModel = new LoadableDetachableModel<List<PullRequest>>() {@Overrideprotected List<PullRequest> load() {List<PullRequest> requests = new ArrayList<>();-+CommitInfoManager commitInfoManager = OneDev.getInstance(CommitInfoManager.class);Collection<ObjectId> fixCommits = commitInfoManager.getFixCommits(getIssue().getProject(), getIssue().getNumber());CodeCommentRelationInfoManager codeCommentRelationInfoManager = OneDev.getInstance(CodeCommentRelationInfoManager.class);@@ -71,109 +64,52 @@ public abstract class IssuePullRequestsPanel extends Panel {};- public IssuePullRequestsPanel(String panelId) {- super(panelId);+ public IssuePullRequestsPanel(String id, IModel<Issue> model) {+ super(id, model);}-- @Override- protected void onDetach() {- requestsModel.detach();- super.onDetach();- }-+@Override- protected void onInitialize() {+ public void onInitialize() {super.onInitialize();- List<IColumn<PullRequest, Void>> columns = new ArrayList<>();-- columns.add(new AbstractColumn<PullRequest, Void>(Model.of("Summary")) {-- @Override- public void populateItem(Item<ICellPopulator<PullRequest>> cellItem, String componentId, IModel<PullRequest> rowModel) {- cellItem.add(new PullRequestSummaryPanel(componentId, rowModel));- }-- @Override- public String getCssClass() {- return "summary";- }-- });-- columns.add(new AbstractColumn<PullRequest, Void>(Model.of("Source")) {+ add(new ListView<PullRequest>("pullRequests", requestsModel) {@Override- public void populateItem(Item<ICellPopulator<PullRequest>> cellItem, String componentId, IModel<PullRequest> rowModel) {- if (rowModel.getObject().getSource() != null) {- Fragment fragment = new Fragment(componentId, "sourceFrag", IssuePullRequestsPanel.this);- fragment.add(new BranchLink("link", rowModel.getObject().getSource(), rowModel.getObject()));- cellItem.add(fragment);- } else {- cellItem.add(new Label(componentId, "<i>Unknown</i>").setEscapeModelStrings(false));- }- }-- @Override- public String getCssClass() {- return "source expanded";- }-- });+ protected void populateItem(ListItem<PullRequest> item) {+ PullRequest request = item.getModelObject();++ Link<Void> link = new BookmarkablePageLink<Void>("title", PullRequestActivitiesPage.class,+ PullRequestActivitiesPage.paramsOf(request, null));+ link.add(new Label("label", "#" + request.getNumber() + " - " + request.getTitle()));+ link.add(AttributeAppender.append("title", request.getTitle()));+ item.add(link);+ item.add(new RequestStatusLabel("status", item.getModel()));+ }}- columns.add(new AbstractColumn<PullRequest, Void>(Model.of("Last Update")) {-- @Override- public void populateItem(Item<ICellPopulator<PullRequest>> cellItem, String componentId, IModel<PullRequest> rowModel) {- PullRequest request = rowModel.getObject();- cellItem.add(new Label(componentId, DateUtils.formatAge(request.getUpdateDate())));- }-- @Override- public String getCssClass() {- return "last-update expanded";- }-- });-- SortableDataProvider<PullRequest, Void> dataProvider = new LoadableDetachableDataProvider<PullRequest, Void>() {-- @Override- public Iterator<? extends PullRequest> iterator(long first, long count) {- return requestsModel.getObject().iterator();- }-- @Override- public long calcSize() {- return requestsModel.getObject().size();- }-- @Override- public IModel<PullRequest> model(PullRequest object) {- Long id = object.getId();- return new LoadableDetachableModel<PullRequest>() {+ );+ }- @Override- protected PullRequest load() {- return OneDev.getInstance(PullRequestManager.class).load(id);- }-- };- }- };-- DataTable<PullRequest, Void> buildsTable = new DataTable<PullRequest, Void>("requests", columns, dataProvider, Integer.MAX_VALUE);- buildsTable.addTopToolbar(new AjaxFallbackHeadersToolbar<Void>(buildsTable, dataProvider));- buildsTable.addBottomToolbar(new NoRecordsToolbar(buildsTable));- add(buildsTable);+ private Issue getIssue() {+ return getModelObject();}- protected abstract Issue getIssue();+ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.canReadCode(getIssue().getProject().getFacade())+ && !requestsModel.getObject().isEmpty());+ }@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);response.render(CssHeaderItem.forReference(new IssuePullRequestsCssResourceReference()));}++ @Override+ protected void onDetach() {+ requestsModel.detach();+ super.onDetach();+ }}diff --git a/core/src/main/java/io/onedev/server/web/component/issue/pullrequests/issue-pull-requests.css b/core/src/main/java/io/onedev/server/web/component/issue/pullrequests/issue-pull-requests.cssindex 8229f37f7b..167965636b 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/pullrequests/issue-pull-requests.css+++ b/core/src/main/java/io/onedev/server/web/component/issue/pullrequests/issue-pull-requests.css@@ -1,5 +1,11 @@-@media(max-width: 991px) {- .issue-pull-requests thead, .issue-pull-requests td.expanded {- display: none;- }+.issue-pull-requests {+ border-top: 1px solid #E8E8E8;+ padding-top: 12px;+}+.issue-pull-requests>.head {+ font-weight: bold;+ margin-bottom: 8px;+}+.issue-pull-requests>.body .pull-request {+ margin-bottom: 6px;}diff --git a/core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java b/core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.javaindex 112283a42a..1efca069b2 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java@@ -376,10 +376,10 @@ public abstract class IssueSidePanel extends Panel {}private Component newVotesContainer() {- WebMarkupContainer votesContainer = new WebMarkupContainer("votes");- votesContainer.setOutputMarkupId(true);+ WebMarkupContainer container = new WebMarkupContainer("votes");+ container.setOutputMarkupId(true);- votesContainer.add(new Label("count", new AbstractReadOnlyModel<String>() {+ container.add(new Label("count", new AbstractReadOnlyModel<String>() {@Overridepublic String getObject() {@@ -388,7 +388,7 @@ public abstract class IssueSidePanel extends Panel {}));- votesContainer.add(new ListView<IssueVote>("voters", new LoadableDetachableModel<List<IssueVote>>() {+ container.add(new ListView<IssueVote>("voters", new LoadableDetachableModel<List<IssueVote>>() {@Overrideprotected List<IssueVote> load() {@@ -414,7 +414,7 @@ public abstract class IssueSidePanel extends Panel {});- votesContainer.add(new UserListLink("more") {+ container.add(new UserListLink("more") {@Overrideprotected void onConfigure() {@@ -459,7 +459,7 @@ public abstract class IssueSidePanel extends Panel {getIssue().getVotes().remove(vote);OneDev.getInstance(IssueVoteManager.class).delete(vote);}- target.add(votesContainer);+ target.add(container);} else {throw new RestartResponseAtInterceptPageException(LoginPage.class);}@@ -486,9 +486,9 @@ public abstract class IssueSidePanel extends Panel {}};- votesContainer.add(voteLink);+ container.add(voteLink);- return votesContainer;+ return container;}private Project getProject() {diff --git a/core/src/main/java/io/onedev/server/web/component/issue/side/issue-side.css b/core/src/main/java/io/onedev/server/web/component/issue/side/issue-side.cssindex fdef3be610..670d66e20f 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/side/issue-side.css+++ b/core/src/main/java/io/onedev/server/web/component/issue/side/issue-side.css@@ -40,3 +40,10 @@.issue-side .milestone>.body>.progress {margin-top: 20px;}+.issue-side .commits .commit {+ margin-bottom: 4px;+}+.issue-side .commits .commit .avatar {+ width: 16px;+ height: 16px;+}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.html b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.htmlindex ae7fed5f09..f730a2c687 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.html+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.html@@ -7,6 +7,8 @@<div class="body"><div class="main"><div wicket:id="operations"></div>+ <div wicket:id="pullRequests"></div>+ <div wicket:id="commits"></div><ul wicket:id="tabs" class="tabs nav nav-tabs"></ul><div wicket:id="tabContent"></div></div>diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.javaindex 7ee5fc3d40..59758bb2e8 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java@@ -2,7 +2,6 @@ package io.onedev.server.web.page.project.issues.boards;import java.util.ArrayList;import java.util.Collection;-import java.util.HashSet;import java.util.List;import javax.annotation.Nullable;@@ -12,9 +11,7 @@ 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.WebMarkupContainer;-import org.apache.wicket.markup.html.panel.Fragment;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.model.PropertyModel;@@ -23,10 +20,8 @@ import org.apache.wicket.request.Url;import org.apache.wicket.request.cycle.IRequestCycleListener;import org.apache.wicket.request.cycle.RequestCycle;import org.eclipse.jgit.lib.ObjectId;-import org.eclipse.jgit.revwalk.RevCommit;import io.onedev.server.OneDev;-import io.onedev.server.cache.CodeCommentRelationInfoManager;import io.onedev.server.cache.CommitInfoManager;import io.onedev.server.cache.UserInfoManager;import io.onedev.server.entitymanager.IssueManager;@@ -39,8 +34,8 @@ import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.inputspec.InputContext;import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.web.component.build.list.BuildListPanel;-import io.onedev.server.web.component.commit.list.CommitListPanel;import io.onedev.server.web.component.issue.activities.IssueActivitiesPanel;+import io.onedev.server.web.component.issue.commits.IssueCommitsPanel;import io.onedev.server.web.component.issue.operation.IssueOperationsPanel;import io.onedev.server.web.component.issue.pullrequests.IssuePullRequestsPanel;import io.onedev.server.web.component.issue.side.IssueSidePanel;@@ -120,6 +115,10 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputConte});+ add(new IssuePullRequestsPanel("pullRequests", getModel()));++ add(new IssueCommitsPanel("commits", getModel()));+List<Tab> tabs = new ArrayList<>();tabs.add(new AjaxActionTab(Model.of("Activities")) {@@ -140,59 +139,6 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputConteCommitInfoManager commitInfoManager = OneDev.getInstance(CommitInfoManager.class);Collection<ObjectId> fixCommits = commitInfoManager.getFixCommits(getProject(), getIssue().getNumber());- if (SecurityUtils.canReadCode(getProject().getFacade())) {- if (!fixCommits.isEmpty()) {- tabs.add(new AjaxActionTab(Model.of("Commits")) {-- @Override- protected void onSelect(AjaxRequestTarget target, Component tabLink) {- Fragment fragment = new Fragment(TAB_CONTENT_ID, "commitsFrag", CardDetailPanel.this);- fragment.add(new CommitListPanel("commits", new AbstractReadOnlyModel<Project>() {-- @Override- public Project getObject() {- return getIssue().getProject();- }-- }, new AbstractReadOnlyModel<List<RevCommit>>() {-- @Override- public List<RevCommit> getObject() {- return getIssue().getCommits();- }-- }));- fragment.setOutputMarkupId(true);- CardDetailPanel.this.replace(fragment);- target.add(fragment);- }-- });- }- CodeCommentRelationInfoManager codeCommentRelationInfoManager = OneDev.getInstance(CodeCommentRelationInfoManager.class);- Collection<Long> pullRequestIds = new HashSet<>();- for (ObjectId commit: fixCommits)- pullRequestIds.addAll(codeCommentRelationInfoManager.getPullRequestIds(getProject(), commit));- if (!pullRequestIds.isEmpty()) {- tabs.add(new AjaxActionTab(Model.of("Pull Requests")) {-- @Override- protected void onSelect(AjaxRequestTarget target, Component tabLink) {- Component content = new IssuePullRequestsPanel(TAB_CONTENT_ID) {-- @Override- protected Issue getIssue() {- return CardDetailPanel.this.getIssue();- }-- }.setOutputMarkupId(true);- CardDetailPanel.this.replace(content);- target.add(content);- }-- });- }- }if (!fixCommits.isEmpty()) {tabs.add(new AjaxActionTab(Model.of("Builds")) {diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.css b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.cssindex 0f81c71ffa..9f67e0da1f 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.css+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.css@@ -213,7 +213,7 @@width: 320px;border-radius: 0 0 4px 0;}-.board-card-detail>.body .issue-info>.nav {+.board-card-detail>.body .issue-side>.nav {padding-right: 20px;border-right: 1px solid #D8D8D8;margin-right: 30px;diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueCommitsPage.html b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueCommitsPage.htmldeleted file mode 100644index 6aef5ed3aa..0000000000--- a/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueCommitsPage.html+++ /dev/null@@ -1,4 +0,0 @@-<wicket:extend>- <div wicket:id="commits"></div>- <div class="help-block"><i class="fa fa-info-circle"></i> This page lists recent commits fixing the issue</div>-</wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueCommitsPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueCommitsPage.javadeleted file mode 100644index 6f2495e987..0000000000--- a/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueCommitsPage.java+++ /dev/null@@ -1,46 +0,0 @@-package io.onedev.server.web.page.project.issues.detail;--import java.util.List;--import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.eclipse.jgit.revwalk.RevCommit;--import io.onedev.server.model.Project;-import io.onedev.server.security.SecurityUtils;-import io.onedev.server.web.component.commit.list.CommitListPanel;--@SuppressWarnings("serial")-public class IssueCommitsPage extends IssueDetailPage {-- public IssueCommitsPage(PageParameters params) {- super(params);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- add(new CommitListPanel("commits", new AbstractReadOnlyModel<Project>() {-- @Override- public Project getObject() {- return getProject();- }-- }, new AbstractReadOnlyModel<List<RevCommit>>() {-- @Override- public List<RevCommit> getObject() {- return getIssue().getCommits();- }-- }));- }-- @Override- protected boolean isPermitted() {- return SecurityUtils.canReadCode(getProject().getFacade());- }--}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.html b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.htmlindex eb55d232ab..c7175e5254 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.html@@ -4,6 +4,8 @@<div wicket:id="workflowChangeAlert"></div><div wicket:id="title"></div><div wicket:id="operations"></div>+ <div wicket:id="pullRequests"></div>+ <div wicket:id="commits"></div><ul wicket:id="issueTabs" class="tabs nav nav-tabs"></ul><wicket:child></wicket:child></div>diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.javaindex d20960966a..1ae6e21df8 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java@@ -2,7 +2,6 @@ package io.onedev.server.web.page.project.issues.detail;import java.util.ArrayList;import java.util.Collection;-import java.util.HashSet;import java.util.List;import javax.annotation.Nullable;@@ -26,7 +25,6 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import org.eclipse.jgit.lib.ObjectId;import io.onedev.server.OneDev;-import io.onedev.server.cache.CodeCommentRelationInfoManager;import io.onedev.server.cache.CommitInfoManager;import io.onedev.server.cache.UserInfoManager;import io.onedev.server.entitymanager.IssueManager;@@ -35,7 +33,9 @@ import io.onedev.server.model.Issue;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.inputspec.InputContext;import io.onedev.server.util.inputspec.InputSpec;+import io.onedev.server.web.component.issue.commits.IssueCommitsPanel;import io.onedev.server.web.component.issue.operation.IssueOperationsPanel;+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.title.IssueTitlePanel;import io.onedev.server.web.component.link.ViewStateAwarePageLink;@@ -124,6 +124,10 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex});+ add(new IssuePullRequestsPanel("pullRequests", issueModel));++ add(new IssueCommitsPanel("commits", issueModel));+List<Tab> tabs = new ArrayList<>();tabs.add(new IssueTab("Activities", IssueActivitiesPage.class) {@@ -138,16 +142,6 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContexCommitInfoManager commitInfoManager = OneDev.getInstance(CommitInfoManager.class);Collection<ObjectId> fixCommits = commitInfoManager.getFixCommits(getProject(), getIssue().getNumber());- if (SecurityUtils.canReadCode(getProject().getFacade())) {- if (!fixCommits.isEmpty())- tabs.add(new IssueTab("Commits", IssueCommitsPage.class));- CodeCommentRelationInfoManager codeCommentRelationInfoManager = OneDev.getInstance(CodeCommentRelationInfoManager.class);- Collection<Long> pullRequestIds = new HashSet<>();- for (ObjectId commit: fixCommits)- pullRequestIds.addAll(codeCommentRelationInfoManager.getPullRequestIds(getProject(), commit));- if (!pullRequestIds.isEmpty())- tabs.add(new IssueTab("Pull Requests", IssuePullRequestsPage.class));- }if (!fixCommits.isEmpty()) // Do not calculate fix builds now as it might be slowtabs.add(new IssueTab("Builds", IssueBuildsPage.class));diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssuePullRequestsPage.html b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssuePullRequestsPage.htmldeleted file mode 100644index b8cec0bf56..0000000000--- a/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssuePullRequestsPage.html+++ /dev/null@@ -1,3 +0,0 @@-<wicket:extend>- <div wicket:id="requests"></div>-</wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssuePullRequestsPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssuePullRequestsPage.javadeleted file mode 100644index 34a74dcf94..0000000000--- a/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssuePullRequestsPage.java+++ /dev/null@@ -1,28 +0,0 @@-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.pullrequests.IssuePullRequestsPanel;--@SuppressWarnings("serial")-public class IssuePullRequestsPage extends IssueDetailPage {-- public IssuePullRequestsPage(PageParameters params) {- super(params);- }-- @Override- protected void onInitialize() {- super.onInitialize();- add(new IssuePullRequestsPanel("requests") {-- @Override- protected Issue getIssue() {- return IssuePullRequestsPage.this.getIssue();- }-- });- }--}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/detail/issue-detail.css b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/issue-detail.cssindex 3f3f677895..53ceb857b6 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/detail/issue-detail.css+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/issue-detail.css@@ -4,7 +4,7 @@#issue-detail>.main>div:last-child {margin-bottom: 0;}-#issue-detail .issue-info>.nav {+#issue-detail .issue-side>.nav {padding-right: 20px;border-right: 1px solid #D8D8D8;margin-right: 30px;@@ -22,7 +22,7 @@#issue-detail .issue-operations a.more-info, #issue-detail .side-info>a.close {display: none;}- #issue-detail .issue-info .nav {+ #issue-detail .issue-side .nav {padding-right: 0;border-right: none;margin-right: 0;