Skip to content

The Unified and Autonomous Development Platform

Display issue commits and pull requests as separate tabs

Robin Shenc76ec4f7ce2a
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java
index 9b565eb413..289755f86e 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java
@@ -44,14 +44,9 @@ import io.onedev.server.model.Milestone;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.support.issue.changedata.IssueBatchUpdateData;
-import io.onedev.server.model.support.issue.changedata.IssueCommittedData;
import io.onedev.server.model.support.issue.changedata.IssueDescriptionChangeData;
import io.onedev.server.model.support.issue.changedata.IssueFieldChangeData;
import io.onedev.server.model.support.issue.changedata.IssueMilestoneChangeData;
-import io.onedev.server.model.support.issue.changedata.IssuePullRequestDiscardedData;
-import io.onedev.server.model.support.issue.changedata.IssuePullRequestMergedData;
-import io.onedev.server.model.support.issue.changedata.IssuePullRequestOpenedData;
-import io.onedev.server.model.support.issue.changedata.IssuePullRequestReopenedData;
import io.onedev.server.model.support.issue.changedata.IssueStateChangeData;
import io.onedev.server.model.support.issue.changedata.IssueTitleChangeData;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestDiscardData;
@@ -329,63 +324,18 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChange
@Transactional
@Listen
- public void on(PullRequestChangeEvent event) {
- if (event.getChange().getData() instanceof PullRequestMergeData) {
- for (Long issueNumber: event.getRequest().getFixedIssueNumbers()) {
- Issue issue = issueManager.find(event.getProject(), issueNumber);
- if (issue != null) {
- IssueChange change = new IssueChange();
- change.setDate(event.getDate());
- change.setUser(event.getUser());
- change.setIssue(issue);
- change.setData(new IssuePullRequestMergedData(event.getRequest()));
- save(change);
- }
- }
+ public void on(PullRequestChangeEvent event) {
+ if (event.getChange().getData() instanceof PullRequestMergeData)
on(event.getRequest(), MergePullRequest.class);
- } else if (event.getChange().getData() instanceof PullRequestDiscardData) {
- for (Long issueNumber: event.getRequest().getFixedIssueNumbers()) {
- Issue issue = issueManager.find(event.getProject(), issueNumber);
- if (issue != null) {
- IssueChange change = new IssueChange();
- change.setDate(event.getDate());
- change.setUser(event.getUser());
- change.setIssue(issue);
- change.setData(new IssuePullRequestDiscardedData(event.getRequest()));
- save(change);
- }
- }
+ else if (event.getChange().getData() instanceof PullRequestDiscardData)
on(event.getRequest(), DiscardPullRequest.class);
- } else if (event.getChange().getData() instanceof PullRequestReopenData) {
- for (Long issueNumber: event.getRequest().getFixedIssueNumbers()) {
- Issue issue = issueManager.find(event.getProject(), issueNumber);
- if (issue != null) {
- IssueChange change = new IssueChange();
- change.setDate(event.getDate());
- change.setUser(event.getUser());
- change.setIssue(issue);
- change.setData(new IssuePullRequestReopenedData(event.getRequest()));
- save(change);
- }
- }
+ else if (event.getChange().getData() instanceof PullRequestReopenData)
on(event.getRequest(), OpenPullRequest.class);
- }
}
@Transactional
@Listen
public void on(PullRequestOpened event) {
- for (Long issueNumber: event.getRequest().getFixedIssueNumbers()) {
- Issue issue = issueManager.find(event.getProject(), issueNumber);
- if (issue != null) {
- IssueChange change = new IssueChange();
- change.setDate(event.getDate());
- change.setUser(event.getUser());
- change.setIssue(issue);
- change.setData(new IssuePullRequestOpenedData(event.getRequest()));
- save(change);
- }
- }
on(event.getRequest(), OpenPullRequest.class);
}
@@ -394,16 +344,6 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChange
public void on(RefUpdated event) {
if (!event.getNewCommitId().equals(ObjectId.zeroId())
&& GitUtils.ref2branch(event.getRefName()) != null) {
- for (Long issueNumber: event.getCommit().getFixedIssueNumbers()) {
- Issue issue = issueManager.find(event.getProject(), issueNumber);
- if (issue != null) {
- IssueChange change = new IssueChange();
- change.setIssue(issue);
- change.setDate(new Date());
- change.setData(new IssueCommittedData(event.getCommit().getCommitId().name()));
- save(change);
- }
- }
Long projectId = event.getCommit().getProject().getId();
ObjectId commitId = event.getCommit().getCommitId();
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
index 7873a7b4a5..7f82089f77 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
@@ -55,7 +55,6 @@ import io.onedev.server.model.support.LastUpdate;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
import io.onedev.server.model.support.issue.NamedIssueQuery;
import io.onedev.server.model.support.issue.changedata.IssueChangeData;
-import io.onedev.server.model.support.issue.changedata.IssueCommittedData;
import io.onedev.server.model.support.issue.changedata.IssueReferencedFromCodeCommentData;
import io.onedev.server.model.support.issue.changedata.IssueReferencedFromIssueData;
import io.onedev.server.model.support.issue.changedata.IssueReferencedFromPullRequestData;
@@ -267,27 +266,16 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements
@Listen
public void on(IssueEvent event) {
boolean minorChange = false;
- LastUpdate lastUpdate = null;
if (event instanceof IssueChangeEvent) {
IssueChangeData changeData = ((IssueChangeEvent)event).getChange().getData();
- if (changeData instanceof IssueCommittedData) {
- User committer = ((IssueCommittedData) changeData).getCommitter(event.getIssue());
- if (committer != null) {
- lastUpdate = new LastUpdate();
- lastUpdate.setUser(committer);
- lastUpdate.setDate(event.getDate());
- lastUpdate.setActivity("committed code");
- }
- } else if (changeData instanceof IssueReferencedFromCodeCommentData
+ if (changeData instanceof IssueReferencedFromCodeCommentData
|| changeData instanceof IssueReferencedFromIssueData
|| changeData instanceof IssueReferencedFromPullRequestData) {
minorChange = true;
}
}
- if (lastUpdate != null)
- event.getIssue().setLastUpdate(lastUpdate);
- else if (!(event instanceof IssueOpened || minorChange))
+ if (!(event instanceof IssueOpened || minorChange))
event.getIssue().setLastUpdate(event.getLastUpdate());
}
diff --git a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
index 10c94c92fd..7a67239a64 100644
--- a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
+++ b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
@@ -1631,6 +1631,16 @@ public class DataMigrator {
}
dom.writeToFile(file, false);
}
+ if (file.getName().startsWith("IssueChanges.xml")) {
+ VersionedDocument dom = VersionedDocument.fromFile(file);
+ for (Element element: dom.getRootElement().elements()) {
+ Element dataElement = element.element("data");
+ String className = dataElement.attributeValue("class");
+ if (className.contains("IssueCommittedData") || className.contains("IssuePullRequest"))
+ element.detach();
+ }
+ dom.writeToFile(file, false);
+ }
}
}
diff --git a/server-core/src/main/java/io/onedev/server/model/IssueChange.java b/server-core/src/main/java/io/onedev/server/model/IssueChange.java
index 19d53dadaa..ada369cb31 100644
--- a/server-core/src/main/java/io/onedev/server/model/IssueChange.java
+++ b/server-core/src/main/java/io/onedev/server/model/IssueChange.java
@@ -34,7 +34,7 @@ public class IssueChange extends AbstractEntity {
private Date date;
@Lob
- @Column(length=65535)
+ @Column(length=65535, nullable=false)
private IssueChangeData data;
public Issue getIssue() {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueCommittedData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueCommittedData.java
deleted file mode 100644
index f77aecfa1c..0000000000
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueCommittedData.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package io.onedev.server.model.support.issue.changedata;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Optional;
-
-import javax.annotation.Nullable;
-
-import org.apache.wicket.Component;
-import org.eclipse.jgit.revwalk.RevCommit;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.UserManager;
-import io.onedev.server.model.Group;
-import io.onedev.server.model.Issue;
-import io.onedev.server.model.IssueChange;
-import io.onedev.server.model.User;
-import io.onedev.server.util.CommentSupport;
-import io.onedev.server.web.component.issue.activities.activity.IssueCommittedPanel;
-
-public class IssueCommittedData implements IssueChangeData {
-
- private static final long serialVersionUID = 1L;
-
- private final String commitHash;
-
- private transient Optional<User> committer;
-
- public IssueCommittedData(String commitHash) {
- this.commitHash = commitHash;
- }
-
- public String getCommitHash() {
- return commitHash;
- }
-
- @Override
- public Component render(String componentId, IssueChange change) {
- return new IssueCommittedPanel(componentId, commitHash) {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- protected Issue getIssue() {
- return change.getIssue();
- }
- };
- }
-
- @Override
- public String getActivity(Issue withIssue) {
- if (withIssue != null)
- return "Code committed for issue " + withIssue.describe();
- else
- return "Code committed";
- }
-
- @Override
- public CommentSupport getCommentSupport() {
- return null;
- }
-
- @Override
- public Map<String, Collection<User>> getNewUsers() {
- return new HashMap<>();
- }
-
- @Override
- public Map<String, Group> getNewGroups() {
- return new HashMap<>();
- }
-
- @Nullable
- public User getCommitter(Issue issue) {
- if (committer == null) {
- RevCommit commit = issue.getProject().getRevCommit(getCommitHash(), false);
- if (commit != null)
- committer = Optional.ofNullable(OneDev.getInstance(UserManager.class).find(commit.getCommitterIdent()));
- else
- committer = Optional.empty();
- }
- return committer.orElse(null);
- }
-
- @Override
- public boolean affectsBoards() {
- return false;
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssuePullRequestData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssuePullRequestData.java
deleted file mode 100644
index b6053be273..0000000000
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssuePullRequestData.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package io.onedev.server.model.support.issue.changedata;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.annotation.Nullable;
-
-import org.apache.wicket.Component;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.PullRequestManager;
-import io.onedev.server.model.Group;
-import io.onedev.server.model.IssueChange;
-import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.User;
-import io.onedev.server.util.CommentSupport;
-import io.onedev.server.web.component.issue.activities.activity.IssuePullRequestPanel;
-
-public abstract class IssuePullRequestData implements IssueChangeData {
-
- private static final long serialVersionUID = 1L;
-
- private final Long requestId;
-
- public IssuePullRequestData(PullRequest request) {
- this.requestId = request.getId();
- }
-
- @Nullable
- public PullRequest getPullRequest() {
- return OneDev.getInstance(PullRequestManager.class).get(requestId);
- }
-
- @Override
- public Component render(String componentId, IssueChange change) {
- return new IssuePullRequestPanel(componentId, requestId);
- }
-
- @Override
- public CommentSupport getCommentSupport() {
- return null;
- }
-
- @Override
- public Map<String, Collection<User>> getNewUsers() {
- return new HashMap<>();
- }
-
- @Override
- public Map<String, Group> getNewGroups() {
- return new HashMap<>();
- }
-
- @Override
- public boolean affectsBoards() {
- return false;
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssuePullRequestDiscardedData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssuePullRequestDiscardedData.java
deleted file mode 100644
index 60243b5046..0000000000
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssuePullRequestDiscardedData.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package io.onedev.server.model.support.issue.changedata;
-
-import io.onedev.server.model.Issue;
-import io.onedev.server.model.PullRequest;
-
-public class IssuePullRequestDiscardedData extends IssuePullRequestData {
-
- private static final long serialVersionUID = 1L;
-
- public IssuePullRequestDiscardedData(PullRequest request) {
- super(request);
- }
-
- @Override
- public String getActivity(Issue withIssue) {
- if (withIssue != null)
- return "discarded pull request fixing issue " + withIssue.describe();
- else
- return "discarded pull request fixing this issue";
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssuePullRequestMergedData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssuePullRequestMergedData.java
deleted file mode 100644
index 2afdbcacba..0000000000
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssuePullRequestMergedData.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package io.onedev.server.model.support.issue.changedata;
-
-import io.onedev.server.model.Issue;
-import io.onedev.server.model.PullRequest;
-
-public class IssuePullRequestMergedData extends IssuePullRequestData {
-
- private static final long serialVersionUID = 1L;
-
- public IssuePullRequestMergedData(PullRequest request) {
- super(request);
- }
-
- @Override
- public String getActivity(Issue withIssue) {
- if (withIssue != null)
- return "merged pull request fixing issue " + withIssue.describe();
- else
- return "merged pull request fixing this issue";
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssuePullRequestOpenedData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssuePullRequestOpenedData.java
deleted file mode 100644
index 89791bd9e8..0000000000
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssuePullRequestOpenedData.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package io.onedev.server.model.support.issue.changedata;
-
-import io.onedev.server.model.Issue;
-import io.onedev.server.model.PullRequest;
-
-public class IssuePullRequestOpenedData extends IssuePullRequestData {
-
- private static final long serialVersionUID = 1L;
-
- public IssuePullRequestOpenedData(PullRequest request) {
- super(request);
- }
-
- @Override
- public String getActivity(Issue withIssue) {
- if (withIssue != null)
- return "opened pull request fixing issue " + withIssue.describe();
- else
- return "opened pull request fixing this issue";
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssuePullRequestReopenedData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssuePullRequestReopenedData.java
deleted file mode 100644
index a16d92c8c3..0000000000
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssuePullRequestReopenedData.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package io.onedev.server.model.support.issue.changedata;
-
-import io.onedev.server.model.Issue;
-import io.onedev.server.model.PullRequest;
-
-public class IssuePullRequestReopenedData extends IssuePullRequestData {
-
- private static final long serialVersionUID = 1L;
-
- public IssuePullRequestReopenedData(PullRequest request) {
- super(request);
- }
-
- @Override
- public String getActivity(Issue withIssue) {
- if (withIssue != null)
- return "reopened pull request fixing issue " + withIssue.describe();
- else
- return "reopened pull request fixing this issue";
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java
index d384be2481..3c3805ce82 100644
--- a/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java
@@ -30,7 +30,6 @@ import io.onedev.server.model.User;
import io.onedev.server.model.support.NamedQuery;
import io.onedev.server.model.support.QuerySetting;
import io.onedev.server.model.support.issue.changedata.IssueChangeData;
-import io.onedev.server.model.support.issue.changedata.IssueCommittedData;
import io.onedev.server.model.support.issue.changedata.IssueReferencedFromCodeCommentData;
import io.onedev.server.model.support.issue.changedata.IssueReferencedFromIssueData;
import io.onedev.server.model.support.issue.changedata.IssueReferencedFromPullRequestData;
@@ -136,20 +135,6 @@ public class IssueNotificationManager {
issueWatchManager.watch(issue, user, true);
}
- User committer = null;
- if (event instanceof IssueChangeEvent) {
- IssueChangeData changeData = ((IssueChangeEvent) event).getChange().getData();
- if (changeData instanceof IssueCommittedData) {
- IssueCommittedData committedData = (IssueCommittedData) changeData;
- committer = committedData.getCommitter(issue);
- if (committer != null) {
- notifiedUsers.add(committer);
- if (!committer.isSystem())
- issueWatchManager.watch(issue, committer, true);
- }
- }
- }
-
Map<String, Group> newGroups = event.getNewGroups();
Map<String, Collection<User>> newUsers = event.getNewUsers();
@@ -248,8 +233,6 @@ public class IssueNotificationManager {
String subject;
if (user != null)
subject = String.format("%s %s", user.getDisplayName(), event.getActivity(true));
- else if (committer != null)
- subject = String.format("%s committed code for issue %s", committer.getDisplayName(), issue.describe());
else
subject = event.getActivity(true);
String body = String.format("Visit <a href='%s'>%s</a> for details", url, url);
diff --git a/server-core/src/main/java/io/onedev/server/util/markdown/EntityReferenceManager.java b/server-core/src/main/java/io/onedev/server/util/markdown/EntityReferenceManager.java
index 5df5b6527d..029f68121b 100644
--- a/server-core/src/main/java/io/onedev/server/util/markdown/EntityReferenceManager.java
+++ b/server-core/src/main/java/io/onedev/server/util/markdown/EntityReferenceManager.java
@@ -116,9 +116,7 @@ public class EntityReferenceManager {
Document document = Jsoup.parseBodyFragment(markdownManager.render(markdown));
for (ProjectScopedNumber referencedIssueFQN: new ReferenceParser(Issue.class).parseReferences(request.getTargetProject(), document)) {
Issue referencedIssue = OneDev.getInstance(IssueManager.class).find(referencedIssueFQN);
- if (referencedIssue != null
- && (!referencedIssue.getProject().equals(request.getTargetProject())
- || !request.getFixedIssueNumbers().contains(referencedIssue.getNumber()))) {
+ if (referencedIssue != null) {
boolean found = false;
for (IssueChange change: referencedIssue.getChanges()) {
if (change.getData() instanceof io.onedev.server.model.support.issue.changedata.IssueReferencedFromPullRequestData) {
diff --git a/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java b/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java
index c6cc997bb8..ead557bca4 100644
--- a/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java
+++ b/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java
@@ -73,7 +73,7 @@ import io.onedev.server.web.page.project.compare.RevisionComparePage;
import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;
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.FixingBuildsPage;
+import io.onedev.server.web.page.project.issues.detail.IssueBuildsPage;
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.project.issues.milestones.MilestoneDetailPage;
@@ -227,7 +227,7 @@ public class OneUrlMapper extends CompoundRequestMapper {
add(new OnePageMapper("projects/${project}/issues", ProjectIssueListPage.class));
add(new OnePageMapper("projects/${project}/issues/${issue}", IssueActivitiesPage.class));
add(new OnePageMapper("projects/${project}/issues/${issue}/activities", IssueActivitiesPage.class));
- add(new OnePageMapper("projects/${project}/issues/${issue}/builds", FixingBuildsPage.class));
+ add(new OnePageMapper("projects/${project}/issues/${issue}/builds", IssueBuildsPage.class));
add(new OnePageMapper("projects/${project}/issues/new", NewIssuePage.class));
add(new OnePageMapper("projects/${project}/milestones", MilestoneListPage.class));
add(new OnePageMapper("projects/${project}/milestones/${milestone}", MilestoneDetailPage.class));
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java
index 1e158dc27e..2b40f4843c 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java
@@ -44,8 +44,6 @@ import io.onedev.server.model.IssueComment;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.issue.changedata.IssueCommittedData;
-import io.onedev.server.model.support.issue.changedata.IssuePullRequestData;
import io.onedev.server.model.support.issue.changedata.IssueReferencedFromCodeCommentData;
import io.onedev.server.model.support.issue.changedata.IssueReferencedFromIssueData;
import io.onedev.server.model.support.issue.changedata.IssueReferencedFromPullRequestData;
@@ -136,14 +134,6 @@ public abstract class IssueActivitiesPanel extends Panel {
CodeComment comment = OneDev.getInstance(CodeCommentManager.class).get(referencedFromCodeCommentData.getCommentId());
if (comment != null)
otherActivities.add(new IssueChangeActivity(change));
- } else if (change.getData() instanceof IssueCommittedData) {
- IssueCommittedData issueCommittedData = (IssueCommittedData) change.getData();
- if (getIssue().getProject().getRevCommit(issueCommittedData.getCommitHash(), false) != null)
- otherActivities.add(new IssueChangeActivity(change));
- } else if (change.getData() instanceof IssuePullRequestData) {
- IssuePullRequestData issuePullRequestData = (IssuePullRequestData) change.getData();
- if (issuePullRequestData.getPullRequest() != null)
- otherActivities.add(new IssueChangeActivity(change));
} else {
otherActivities.add(new IssueChangeActivity(change));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommittedPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommittedPanel.html
deleted file mode 100644
index 98ce2380ed..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommittedPanel.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<wicket:panel>
- <div wicket:id="commit">
- <div wicket:id="author" class="author"></div>
- <div wicket:id="message" class="message"></div>
- <div class="actions">
- <span wicket:id="buildStatus" class="build-status"></span>
- <span class="btn-group hash">
- <a wicket:id="hashLink" class="hash btn btn-xs btn-default"><span wicket:id="hash"></span></a>
- <a wicket:id="copyHash" class="btn btn-xs btn-default"><i class="fa fa-clipboard"></i></a>
- </span>
- <span class="btn-group browse">
- <a wicket:id="browseCode" title="Browse code" class="btn btn-default btn-xs"><i class="fa fa-file-text-o"></i></a>
- </span>
- </div>
- </div>
-</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommittedPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommittedPanel.java
deleted file mode 100644
index 97a98fd62c..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueCommittedPanel.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package io.onedev.server.web.component.issue.activities.activity;
-
-import org.apache.wicket.behavior.AttributeAppender;
-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.panel.GenericPanel;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.eclipse.jgit.lib.FileMode;
-import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.revwalk.RevCommit;
-
-import io.onedev.server.git.BlobIdent;
-import io.onedev.server.git.GitUtils;
-import io.onedev.server.model.Issue;
-import io.onedev.server.model.Project;
-import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;
-import io.onedev.server.web.component.commit.message.CommitMessagePanel;
-import io.onedev.server.web.component.commit.status.CommitStatusPanel;
-import io.onedev.server.web.component.link.ViewStateAwarePageLink;
-import io.onedev.server.web.component.user.ident.Mode;
-import io.onedev.server.web.component.user.ident.PersonIdentPanel;
-import io.onedev.server.web.page.project.blob.ProjectBlobPage;
-import io.onedev.server.web.page.project.commits.CommitDetailPage;
-
-@SuppressWarnings("serial")
-public abstract class IssueCommittedPanel extends GenericPanel<RevCommit> {
-
- private final String commitHash;
-
- public IssueCommittedPanel(String id, String commitHash) {
- super(id);
- this.commitHash = commitHash;
-
- setModel(new LoadableDetachableModel<RevCommit>() {
-
- @Override
- protected RevCommit load() {
- return getIssue().getProject().getRevCommit(commitHash, true);
- }
-
- });
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- RevCommit commit = getModelObject();
-
- WebMarkupContainer container = new WebMarkupContainer("commit");
- add(container);
-
- container.add(new PersonIdentPanel("author", commit.getAuthorIdent(), "Author", Mode.AVATAR));
-
- container.add(new CommitMessagePanel("message", getModel()) {
-
- @Override
- protected Project getProject() {
- return getIssue().getProject();
- }
-
- });
-
- CommitStatusPanel commitStatus = new CommitStatusPanel("buildStatus", ObjectId.fromString(commitHash)) {
-
- @Override
- protected String getCssClasses() {
- return "btn btn-default btn-xs";
- }
-
- @Override
- protected Project getProject() {
- return getIssue().getProject();
- }
-
- };
- container.add(commitStatus);
-
- Project project = getIssue().getProject();
- CommitDetailPage.State commitState = new CommitDetailPage.State();
- commitState.revision = commit.name();
- PageParameters params = CommitDetailPage.paramsOf(project, commitState);
- Link<Void> hashLink = new ViewStateAwarePageLink<Void>("hashLink", CommitDetailPage.class, params);
- container.add(hashLink);
- hashLink.add(new Label("hash", GitUtils.abbreviateSHA(commit.name())));
- container.add(new WebMarkupContainer("copyHash").add(new CopyClipboardBehavior(Model.of(commit.name()))));
-
- BlobIdent blobIdent = new BlobIdent(commit.name(), null, FileMode.TYPE_TREE);
- ProjectBlobPage.State browseState = new ProjectBlobPage.State(blobIdent);
- params = ProjectBlobPage.paramsOf(project, browseState);
- container.add(new ViewStateAwarePageLink<Void>("browseCode", ProjectBlobPage.class, params));
-
- container.add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {
-
- @Override
- protected String load() {
- commitStatus.configure();
- if (commitStatus.isVisible())
- return "commit with-status";
- else
- return "commit";
- }
-
- }));
-
- }
-
- protected abstract Issue getIssue();
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssuePullRequestPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssuePullRequestPanel.html
deleted file mode 100644
index 95d4b0c904..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssuePullRequestPanel.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<wicket:panel>
- <div class="pull-request title-and-status">
- <div wicket:id="title" class="title"></div>
- <div wicket:id="state" class="status"></div>
- </div>
-</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssuePullRequestPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssuePullRequestPanel.java
deleted file mode 100644
index d26681adfe..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssuePullRequestPanel.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package io.onedev.server.web.component.issue.activities.activity;
-
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.request.cycle.RequestCycle;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.PullRequestManager;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.PullRequest;
-import io.onedev.server.web.component.pullrequest.RequestStatusLabel;
-import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;
-import io.onedev.server.web.util.ReferenceTransformer;
-
-@SuppressWarnings("serial")
-public class IssuePullRequestPanel extends Panel {
-
- private final Long requestId;
-
- private final IModel<PullRequest> requestModel = new LoadableDetachableModel<PullRequest>() {
-
- @Override
- protected PullRequest load() {
- return OneDev.getInstance(PullRequestManager.class).load(requestId);
- }
-
- };
-
- public IssuePullRequestPanel(String id, Long requestId) {
- super(id);
- this.requestId = requestId;
- }
-
- private PullRequest getPullRequest() {
- return requestModel.getObject();
- }
-
- @Override
- protected void onDetach() {
- requestModel.detach();
- super.onDetach();
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- add(new RequestStatusLabel("state", requestModel));
-
- PullRequest request = getPullRequest();
-
- Project project = request.getTargetProject();
-
- String url = RequestCycle.get().urlFor(PullRequestActivitiesPage.class,
- PullRequestActivitiesPage.paramsOf(request, null)).toString();
- ReferenceTransformer transformer = new ReferenceTransformer(project, url);
- String transformed = transformer.apply(request.getTitle());
- String title = String.format("<a href='%s'>#%d</a> %s", url, request.getNumber(), transformed);
- add(new Label("title", title).setEscapeModelStrings(false));
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/issue-activities.css b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/issue-activities.css
index d90386b8cc..48d1012b76 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/issue-activities.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/issue-activities.css
@@ -56,25 +56,6 @@
.issue-activities .activity>.content>.body .plain.diff {
margin-bottom: 12px;
}
-.issue-activities .activity>.content>.body>.commit {
- color: #888;
- position: relative;
-}
-.issue-activities .activity>.content>.body>.commit .author {
- width: 28px;
- position: absolute;
-}
-.issue-activities .activity>.content>.body>.commit .message {
- padding: 0 128px 0 28px;
-}
-.issue-activities .activity>.content>.body>.commit.with-status .message {
- padding-right: 175px;
-}
-.issue-activities .activity>.content>.body>.commit .actions {
- position: absolute;
- right: 0;
- top: 0;
-}
.issue-activities .activity>.content>.head a {
color: #999;
margin-left: 8px;
@@ -91,15 +72,3 @@
background: #F9F9F9;
border-radius: 4px;
}
-@media(max-width: 991px) {
- .issue-activities .activity>.content>.body>.commit .browse,
- .issue-activities .activity>.content>.body>.commit .hash {
- display: none;
- }
- .issue-activities .activity>.content>.body>.commit .message {
- padding-right: 0;
- }
- .issue-activities .activity>.content>.body>.commit.with-status .message {
- padding-right: 45px;
- }
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsCssResourceReference.java
new file mode 100644
index 0000000000..0e2cd2843b
--- /dev/null
+++ b/server-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/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.html
new file mode 100644
index 0000000000..b5d531a1b3
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.html
@@ -0,0 +1,18 @@
+<wicket:panel>
+ <div class="issue-commits">
+ <div wicket:id="commits" class="commit clearfix">
+ <div wicket:id="author" class="author"></div>
+ <div wicket:id="message" class="message"></div>
+ <div class="actions">
+ <span wicket:id="buildStatus" class="build-status"></span>
+ <span class="btn-group hash">
+ <a wicket:id="hashLink" class="hash btn btn-xs btn-default"><span wicket:id="hash"></span></a>
+ <a wicket:id="copyHash" class="btn btn-xs btn-default"><i class="fa fa-clipboard"></i></a>
+ </span>
+ <span class="btn-group browse">
+ <a wicket:id="browseCode" title="Browse code" class="btn btn-default btn-xs"><i class="fa fa-file-text-o"></i></a>
+ </span>
+ </div>
+ </div>
+ </div>
+</wicket:panel>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.java
new file mode 100644
index 0000000000..a0ec25b4a5
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.java
@@ -0,0 +1,127 @@
+package io.onedev.server.web.component.issue.commits;
+
+import java.util.List;
+
+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.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.LoadableDetachableModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.eclipse.jgit.lib.FileMode;
+import org.eclipse.jgit.revwalk.RevCommit;
+
+import io.onedev.server.git.BlobIdent;
+import io.onedev.server.git.GitUtils;
+import io.onedev.server.model.Issue;
+import io.onedev.server.model.Project;
+import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;
+import io.onedev.server.web.component.commit.message.CommitMessagePanel;
+import io.onedev.server.web.component.commit.status.CommitStatusPanel;
+import io.onedev.server.web.component.link.ViewStateAwarePageLink;
+import io.onedev.server.web.component.user.ident.Mode;
+import io.onedev.server.web.component.user.ident.PersonIdentPanel;
+import io.onedev.server.web.page.project.blob.ProjectBlobPage;
+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();
+
+ item.add(new PersonIdentPanel("author", commit.getAuthorIdent(), "Author", Mode.AVATAR));
+
+ item.add(new CommitMessagePanel("message", item.getModel()) {
+
+ @Override
+ protected Project getProject() {
+ return getIssue().getProject();
+ }
+
+ });
+
+ CommitStatusPanel commitStatus = new CommitStatusPanel("buildStatus", commit.copy()) {
+
+ @Override
+ protected String getCssClasses() {
+ return "btn btn-default btn-xs";
+ }
+
+ @Override
+ protected Project getProject() {
+ return getIssue().getProject();
+ }
+
+ };
+ item.add(commitStatus);
+
+ Project project = getIssue().getProject();
+ CommitDetailPage.State commitState = new CommitDetailPage.State();
+ commitState.revision = commit.name();
+ PageParameters params = CommitDetailPage.paramsOf(project, commitState);
+ Link<Void> hashLink = new ViewStateAwarePageLink<Void>("hashLink", CommitDetailPage.class, params);
+ item.add(hashLink);
+ hashLink.add(new Label("hash", GitUtils.abbreviateSHA(commit.name())));
+ item.add(new WebMarkupContainer("copyHash").add(new CopyClipboardBehavior(Model.of(commit.name()))));
+
+ BlobIdent blobIdent = new BlobIdent(commit.name(), null, FileMode.TYPE_TREE);
+ ProjectBlobPage.State browseState = new ProjectBlobPage.State(blobIdent);
+ params = ProjectBlobPage.paramsOf(project, browseState);
+ item.add(new ViewStateAwarePageLink<Void>("browseCode", ProjectBlobPage.class, params));
+
+ item.add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {
+
+ @Override
+ protected String load() {
+ commitStatus.configure();
+ if (commitStatus.isVisible())
+ return "commit with-status";
+ else
+ return "commit";
+ }
+
+ }));
+ }
+
+ });
+
+ }
+
+ private Issue getIssue() {
+ return getModelObject();
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(CssHeaderItem.forReference(new IssueCommitsCssResourceReference()));
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/commits/issue-commits.css b/server-core/src/main/java/io/onedev/server/web/component/issue/commits/issue-commits.css
new file mode 100644
index 0000000000..9c8126f940
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/commits/issue-commits.css
@@ -0,0 +1,37 @@
+.issue-commits .commit {
+ color: #888;
+ position: relative;
+ padding: 8px 0;
+ border-top: 1px solid #E8E8E8;
+}
+.issue-commits .commit:first-child {
+ border-top: none;
+}
+.issue-commits .commit .author {
+ width: 28px;
+ position: absolute;
+}
+.issue-commits .commit .message {
+ padding: 0 128px 0 28px;
+}
+.issue-commits .commit.with-status .message {
+ padding-right: 175px;
+}
+.issue-commits .commit .actions {
+ position: absolute;
+ right: 0;
+ top: 8px;
+}
+
+@media(max-width: 991px) {
+ .issue-commits .commit .browse,
+ .issue-commits .commit .hash {
+ display: none;
+ }
+ .issue-commits .commit .message {
+ padding-right: 0;
+ }
+ .issue-commits .commit.with-status .message {
+ padding-right: 45px;
+ }
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsCssResourceReference.java
new file mode 100644
index 0000000000..9e079a3383
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsCssResourceReference.java
@@ -0,0 +1,13 @@
+package io.onedev.server.web.component.issue.pullrequests;
+
+import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
+
+public class IssuePullRequestsCssResourceReference extends BaseDependentCssResourceReference {
+
+ private static final long serialVersionUID = 1L;
+
+ public IssuePullRequestsCssResourceReference() {
+ super(IssuePullRequestsCssResourceReference.class, "issue-pull-requests.css");
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.html
new file mode 100644
index 0000000000..d1106309a1
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.html
@@ -0,0 +1,8 @@
+<wicket:panel>
+ <div class="issue-pull-requests">
+ <div wicket:id="pullRequests" class="pull-request">
+ <a wicket:id="title" class="title"><span wicket:id="label"></span></a>
+ <span wicket:id="status" class="status"></span>
+ </div>
+ </div>
+</wicket:panel>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.java
new file mode 100644
index 0000000000..adcb2f2004
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/pullrequests/IssuePullRequestsPanel.java
@@ -0,0 +1,105 @@
+package io.onedev.server.web.component.issue.pullrequests;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.List;
+
+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.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.eclipse.jgit.lib.ObjectId;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.PullRequestManager;
+import io.onedev.server.infomanager.CodeCommentRelationInfoManager;
+import io.onedev.server.infomanager.CommitInfoManager;
+import io.onedev.server.model.Issue;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.web.component.pullrequest.RequestStatusLabel;
+import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;
+
+@SuppressWarnings("serial")
+public class IssuePullRequestsPanel extends GenericPanel<Issue> {
+
+ private final IModel<List<PullRequest>> requestsModel = new LoadableDetachableModel<List<PullRequest>>() {
+
+ @Override
+ protected 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);
+ Collection<Long> pullRequestIds = new HashSet<>();
+ for (ObjectId commit: fixCommits)
+ pullRequestIds.addAll(codeCommentRelationInfoManager.getPullRequestIds(getIssue().getProject(), commit));
+
+ for (Long requestId: pullRequestIds) {
+ PullRequest request = OneDev.getInstance(PullRequestManager.class).get(requestId);
+ if (request != null && !requests.contains(request))
+ requests.add(request);
+ }
+ Collections.sort(requests, new Comparator<PullRequest>() {
+
+ @Override
+ public int compare(PullRequest o1, PullRequest o2) {
+ return o2.getId().compareTo(o1.getId());
+ }
+
+ });
+ return requests;
+ }
+
+ };
+
+ public IssuePullRequestsPanel(String id, IModel<Issue> model) {
+ super(id, model);
+ }
+
+ @Override
+ public void onInitialize() {
+ super.onInitialize();
+
+ add(new ListView<PullRequest>("pullRequests", requestsModel) {
+
+ @Override
+ 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()));
+ item.add(link);
+ item.add(new RequestStatusLabel("status", item.getModel()));
+ }}
+
+ );
+ }
+
+ private Issue getIssue() {
+ return getModelObject();
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(CssHeaderItem.forReference(new IssuePullRequestsCssResourceReference()));
+ }
+
+ @Override
+ protected void onDetach() {
+ requestsModel.detach();
+ super.onDetach();
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/pullrequests/issue-pull-requests.css b/server-core/src/main/java/io/onedev/server/web/component/issue/pullrequests/issue-pull-requests.css
new file mode 100644
index 0000000000..ac691c422e
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/pullrequests/issue-pull-requests.css
@@ -0,0 +1,13 @@
+.issue-pull-requests .pull-request {
+ padding: 8px 80px 8px 0;
+ border-top: 1px solid #E8E8E8;
+ position: relative;
+}
+.issue-pull-requests .pull-request:first-child {
+ border-top: none;
+}
+.issue-pull-requests .pull-request .status {
+ position: absolute;
+ top: 10px;
+ right: 0;
+}
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 b88d57e3b0..7e603c0797 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
@@ -36,7 +36,9 @@ import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
import io.onedev.server.web.ajaxlistener.ConfirmListener;
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.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.sideinfo.SideInfoPanel;
@@ -125,7 +127,32 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputConte
Collection<ObjectId> fixCommits = commitInfoManager.getFixCommits(getProject(), getIssue().getNumber());
if (!fixCommits.isEmpty()) {
- tabs.add(new AjaxActionTab(Model.of("Builds")) {
+ if (SecurityUtils.canReadCode(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);
+ }
+
+ });
+ tabs.add(new AjaxActionTab(Model.of("Pull Requests")) {
+
+ @Override
+ protected void onSelect(AjaxRequestTarget target, Component tabLink) {
+ Component content = new IssuePullRequestsPanel(TAB_CONTENT_ID, CardDetailPanel.this.getModel());
+ content.setOutputMarkupId(true);
+ CardDetailPanel.this.replace(content);
+ target.add(content);
+ }
+
+ });
+ }
+
+ tabs.add(new AjaxActionTab(Model.of("Fixing Builds")) {
@Override
protected void onSelect(AjaxRequestTarget target, Component tabLink) {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/FixingBuildsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/FixingBuildsPage.html
deleted file mode 100644
index 569b482680..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/FixingBuildsPage.html
+++ /dev/null
@@ -1,4 +0,0 @@
-<wicket:extend>
- <div wicket:id="builds"></div>
- <div class="help-block"><i class="fa fa-info-circle"></i> This page lists all builds containing the the issue fix</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.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/FixingBuildsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueBuildsPage.java
similarity index 90%
rename from server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/FixingBuildsPage.java
rename to server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueBuildsPage.java
index ac6bf69011..9612cd7cf3 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/FixingBuildsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueBuildsPage.java
@@ -18,7 +18,7 @@ import io.onedev.server.web.util.PagingHistorySupport;
import io.onedev.server.web.util.QueryPosition;
@SuppressWarnings("serial")
-public class FixingBuildsPage extends IssueDetailPage {
+public class IssueBuildsPage extends IssueDetailPage {
private static final String PARAM_QUERY = "query";
@@ -26,7 +26,7 @@ public class FixingBuildsPage extends IssueDetailPage {
private String query;
- public FixingBuildsPage(PageParameters params) {
+ public IssueBuildsPage(PageParameters params) {
super(params);
query = params.get(PARAM_QUERY).toString();
}
@@ -66,8 +66,8 @@ public class FixingBuildsPage extends IssueDetailPage {
@Override
protected void onQueryUpdated(AjaxRequestTarget target, String query) {
- CharSequence url = RequestCycle.get().urlFor(FixingBuildsPage.class, paramsOf(getIssue(), getPosition(), query));
- FixingBuildsPage.this.query = query;
+ CharSequence url = RequestCycle.get().urlFor(IssueBuildsPage.class, paramsOf(getIssue(), getPosition(), query));
+ IssueBuildsPage.this.query = query;
pushState(target, url.toString(), query);
}
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..9002c0f42e
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueCommitsPage.java
@@ -0,0 +1,20 @@
+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;
+
+@SuppressWarnings("serial")
+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/IssueDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java
index ccd7338f6c..5e7826517c 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
@@ -62,7 +62,7 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex
public static final String PARAM_ISSUE = "issue";
- private final IModel<Issue> issueModel;
+ protected final IModel<Issue> issueModel;
private final QueryPosition position;
@@ -143,8 +143,13 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex
Collection<ObjectId> fixCommits = commitInfoManager.getFixCommits(getProject(), getIssue().getNumber());
// Do not calculate fix builds now as it might be slow
- if (!fixCommits.isEmpty())
- tabs.add(new IssueTab("Fixing Builds", FixingBuildsPage.class));
+ if (!fixCommits.isEmpty()) {
+ if (SecurityUtils.canReadCode(getProject())) {
+ tabs.add(new IssueTab("Fixing Commits", IssueCommitsPage.class));
+ tabs.add(new IssueTab("Pull Requests", IssuePullRequestsPage.class));
+ }
+ tabs.add(new IssueTab("Fixing Builds", IssueBuildsPage.class));
+ }
add(new Tabbable("issueTabs", tabs).setOutputMarkupId(true));
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..093cb1661a
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssuePullRequestsPage.java
@@ -0,0 +1,20 @@
+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;
+
+@SuppressWarnings("serial")
+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/pullrequests/detail/activities/pull-request-activities.css b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/pull-request-activities.css
index 73c057826b..42e5e7b546 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/pull-request-activities.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/pull-request-activities.css
@@ -38,9 +38,6 @@
position: relative;
padding: 6px 0;
}
-#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit:hover {
- background: #F7ECB9;
-}
#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit>.author {
position: absolute;
left: 24px;
@@ -71,7 +68,7 @@
#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit>.actions {
position: absolute;
top: 6px;
- right: 4px;
+ right: 0;
}
#request-detail>.main>.activities .activity>td>.content {