Skip to content

The Unified and Autonomous Development Platform

Draft implementation of issue links

Robin Shen339c0e4f22af
diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.java
index bfc58880df..5dc7125579 100644
--- a/server-core/src/main/java/io/onedev/server/CoreModule.java
+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java
@@ -114,11 +114,13 @@ import io.onedev.server.entitymanager.GroupManager;
import io.onedev.server.entitymanager.IssueChangeManager;
import io.onedev.server.entitymanager.IssueCommentManager;
import io.onedev.server.entitymanager.IssueFieldManager;
+import io.onedev.server.entitymanager.IssueLinkManager;
import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.entitymanager.IssueQueryPersonalizationManager;
import io.onedev.server.entitymanager.IssueScheduleManager;
import io.onedev.server.entitymanager.IssueVoteManager;
import io.onedev.server.entitymanager.IssueWatchManager;
+import io.onedev.server.entitymanager.LinkSpecManager;
import io.onedev.server.entitymanager.MembershipManager;
import io.onedev.server.entitymanager.MilestoneManager;
import io.onedev.server.entitymanager.ProjectManager;
@@ -154,11 +156,13 @@ import io.onedev.server.entitymanager.impl.DefaultGroupManager;
import io.onedev.server.entitymanager.impl.DefaultIssueChangeManager;
import io.onedev.server.entitymanager.impl.DefaultIssueCommentManager;
import io.onedev.server.entitymanager.impl.DefaultIssueFieldManager;
+import io.onedev.server.entitymanager.impl.DefaultIssueLinkManager;
import io.onedev.server.entitymanager.impl.DefaultIssueManager;
import io.onedev.server.entitymanager.impl.DefaultIssueQueryPersonalizationManager;
import io.onedev.server.entitymanager.impl.DefaultIssueScheduleManager;
import io.onedev.server.entitymanager.impl.DefaultIssueVoteManager;
import io.onedev.server.entitymanager.impl.DefaultIssueWatchManager;
+import io.onedev.server.entitymanager.impl.DefaultLinkSpecManager;
import io.onedev.server.entitymanager.impl.DefaultMembershipManager;
import io.onedev.server.entitymanager.impl.DefaultMilestoneManager;
import io.onedev.server.entitymanager.impl.DefaultProjectManager;
@@ -427,6 +431,8 @@ public class CoreModule extends AbstractPluginModule {
bind(EntityReferenceManager.class).to(DefaultEntityReferenceManager.class);
bind(GitLfsLockManager.class).to(DefaultGitLfsLockManager.class);
bind(IssueScheduleManager.class).to(DefaultIssueScheduleManager.class);
+ bind(LinkSpecManager.class).to(DefaultLinkSpecManager.class);
+ bind(IssueLinkManager.class).to(DefaultIssueLinkManager.class);
bind(WebHookManager.class);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/IssueChangeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/IssueChangeManager.java
index f28ea4d51d..b7146a8c0c 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/IssueChangeManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/IssueChangeManager.java
@@ -9,20 +9,27 @@ import javax.annotation.Nullable;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueChange;
+import io.onedev.server.model.LinkSpec;
import io.onedev.server.model.Milestone;
import io.onedev.server.persistence.dao.EntityManager;
public interface IssueChangeManager extends EntityManager<IssueChange> {
+ void changeLink(LinkSpec spec, Issue issue, Issue linkedIssue, boolean opposite);
+
+ void addLink(LinkSpec spec, Issue issue, Issue linkedIssue, boolean opposite);
+
+ void removeLink(LinkSpec spec, Issue issue, Issue linkedIssue, boolean opposite);
+
void changeTitle(Issue issue, String title);
void changeFields(Issue issue, Map<String, Object> fieldValues);
void changeMilestones(Issue issue, Collection<Milestone> milestones);
- void addToMilestone(Issue issue, Milestone milestone);
+ void addSchedule(Issue issue, Milestone milestone);
- void removeFromMilestone(Issue issue, Milestone milestone);
+ void removeSchedule(Issue issue, Milestone milestone);
void changeState(Issue issue, String state, Map<String, Object> fieldValues,
Collection<String> removeFields, @Nullable String comment);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/IssueLinkManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/IssueLinkManager.java
new file mode 100644
index 0000000000..10daba0574
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/IssueLinkManager.java
@@ -0,0 +1,14 @@
+package io.onedev.server.entitymanager;
+
+import java.util.Collection;
+
+import io.onedev.server.model.Issue;
+import io.onedev.server.model.IssueLink;
+import io.onedev.server.model.LinkSpec;
+import io.onedev.server.persistence.dao.EntityManager;
+
+public interface IssueLinkManager extends EntityManager<IssueLink> {
+
+ void syncLinks(LinkSpec spec, Issue issue, Collection<Issue> linkedIssues, boolean opposite);
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/LinkSpecManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/LinkSpecManager.java
new file mode 100644
index 0000000000..a41fa1e872
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/LinkSpecManager.java
@@ -0,0 +1,13 @@
+package io.onedev.server.entitymanager;
+
+import javax.annotation.Nullable;
+
+import io.onedev.server.model.LinkSpec;
+import io.onedev.server.persistence.dao.EntityManager;
+
+public interface LinkSpecManager extends EntityManager<LinkSpec> {
+
+ @Nullable
+ LinkSpec find(String name);
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java
index 9bb08001f3..c6b4a1ba02 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java
@@ -27,6 +27,7 @@ import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import javax.persistence.criteria.Selection;
+import org.apache.commons.lang3.StringUtils;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevWalk;
@@ -369,6 +370,15 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Bui
List<Build> builds = new ArrayList<>();
EntityCriteria<Build> criteria = newCriteria();
+
+ if (term.contains("#")) {
+ String projectPath = StringUtils.substringBefore(term, "#");
+ Project specifiedProject = projectManager.find(projectPath);
+ if (specifiedProject != null && SecurityUtils.canAccess(specifiedProject)) {
+ project = specifiedProject;
+ term = StringUtils.substringAfter(term, "#");
+ }
+ }
Set<Project> projects = Sets.newHashSet(project);
projects.addAll(project.getForkParents());
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 e30e545cfd..3b4f98283c 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
@@ -2,7 +2,6 @@ package io.onedev.server.entitymanager.impl;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@@ -36,6 +35,7 @@ import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.entitymanager.IssueChangeManager;
import io.onedev.server.entitymanager.IssueFieldManager;
+import io.onedev.server.entitymanager.IssueLinkManager;
import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.entitymanager.IssueScheduleManager;
import io.onedev.server.entitymanager.ProjectManager;
@@ -53,12 +53,16 @@ import io.onedev.server.model.Build;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueChange;
import io.onedev.server.model.IssueSchedule;
+import io.onedev.server.model.LinkSpec;
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.TransitionSpec;
import io.onedev.server.model.support.issue.changedata.IssueBatchUpdateData;
import io.onedev.server.model.support.issue.changedata.IssueFieldChangeData;
+import io.onedev.server.model.support.issue.changedata.IssueLinkAddData;
+import io.onedev.server.model.support.issue.changedata.IssueLinkChangeData;
+import io.onedev.server.model.support.issue.changedata.IssueLinkRemoveData;
import io.onedev.server.model.support.issue.changedata.IssueMilestoneAddData;
import io.onedev.server.model.support.issue.changedata.IssueMilestoneChangeData;
import io.onedev.server.model.support.issue.changedata.IssueMilestoneRemoveData;
@@ -117,6 +121,8 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>
private final IssueScheduleManager issueScheduleManager;
+ private final IssueLinkManager issueLinkManager;
+
private final ExecutorService executorService;
private final ListenerRegistry listenerRegistry;
@@ -131,7 +137,7 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>
ProjectManager projectManager, BuildManager buildManager,
ExecutorService executorService, PullRequestManager pullRequestManager,
ListenerRegistry listenerRegistry, TaskScheduler taskScheduler,
- IssueScheduleManager issueScheduleManager) {
+ IssueScheduleManager issueScheduleManager, IssueLinkManager issueLinkManager) {
super(dao);
this.issueManager = issueManager;
this.issueFieldManager = issueFieldManager;
@@ -143,6 +149,7 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>
this.listenerRegistry = listenerRegistry;
this.taskScheduler = taskScheduler;
this.issueScheduleManager = issueScheduleManager;
+ this.issueLinkManager = issueLinkManager;
}
@Transactional
@@ -161,7 +168,6 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>
IssueChange change = new IssueChange();
change.setIssue(issue);
- change.setDate(new Date());
change.setUser(SecurityUtils.getUser());
change.setData(new IssueTitleChangeData(prevTitle, issue.getTitle()));
save(change);
@@ -170,11 +176,10 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>
@Transactional
@Override
- public void addToMilestone(Issue issue, Milestone milestone) {
- issueScheduleManager.save(issue.addToMilestone(milestone));
+ public void addSchedule(Issue issue, Milestone milestone) {
+ issueScheduleManager.save(issue.addSchedule(milestone));
IssueChange change = new IssueChange();
- change.setDate(new Date());
change.setIssue(issue);
change.setData(new IssueMilestoneAddData(milestone.getName()));
change.setUser(SecurityUtils.getUser());
@@ -183,12 +188,11 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>
@Transactional
@Override
- public void removeFromMilestone(Issue issue, Milestone milestone) {
- IssueSchedule schedule = issue.removeFromMilestone(milestone);
+ public void removeSchedule(Issue issue, Milestone milestone) {
+ IssueSchedule schedule = issue.removeSchedule(milestone);
if (schedule != null) {
issueScheduleManager.delete(schedule);
IssueChange change = new IssueChange();
- change.setDate(new Date());
change.setIssue(issue);
change.setData(new IssueMilestoneRemoveData(milestone.getName()));
change.setUser(SecurityUtils.getUser());
@@ -206,7 +210,6 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>
IssueChange change = new IssueChange();
change.setIssue(issue);
- change.setDate(new Date());
change.setUser(SecurityUtils.getUser());
change.setData(new IssueFieldChangeData(prevFields, issue.getFieldInputs()));
save(change);
@@ -228,7 +231,6 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>
IssueChange change = new IssueChange();
change.setIssue(issue);
- change.setDate(new Date());
change.setUser(SecurityUtils.getUser());
change.setData(new IssueStateChangeData(prevState, issue.getState(),
prevFields, issue.getFieldInputs(), comment));
@@ -259,7 +261,6 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>
|| !new HashSet<>(prevMilestones).equals(new HashSet<>(issue.getMilestones()))) {
IssueChange change = new IssueChange();
change.setIssue(issue);
- change.setDate(new Date());
change.setUser(SecurityUtils.getUser());
List<Milestone> prevMilestoneList = new ArrayList<>(prevMilestones);
@@ -615,7 +616,6 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>
issueScheduleManager.syncMilestones(issue, milestones);
IssueChange change = new IssueChange();
change.setIssue(issue);
- change.setDate(new Date());
change.setUser(SecurityUtils.getUser());
List<Milestone> prevMilestoneList = new ArrayList<>(prevMilestones);
@@ -627,5 +627,115 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>
}
}
+
+ @Transactional
+ @Override
+ public void changeLink(LinkSpec spec, Issue issue, Issue linkedIssue, boolean opposite) {
+ Issue prevLinkedIssue = issue.findLinkedIssue(spec, opposite);
+
+ List<Issue> linkedIssues = new ArrayList<>();
+ if (linkedIssue != null)
+ linkedIssues.add(linkedIssue);
+ issueLinkManager.syncLinks(spec, issue, linkedIssues, opposite);
+
+ IssueChange change = new IssueChange();
+ change.setIssue(issue);
+ change.setUser(SecurityUtils.getUser());
+
+ String linkName = opposite?spec.getOpposite().getName():spec.getName();
+
+ IssueLinkChangeData data = new IssueLinkChangeData(linkName,
+ getIssueSummary(issue, prevLinkedIssue),
+ getIssueSummary(issue, linkedIssue));
+ change.setData(data);
+ save(change);
+
+ logLinkedSideChange(spec, issue, prevLinkedIssue, linkedIssue, opposite);
+ }
+
+ private void logLinkedSideChange(LinkSpec spec, Issue issue, @Nullable Issue prevLinkedIssue,
+ @Nullable Issue linkedIssue, boolean opposite) {
+ String linkName;
+ boolean multiple;
+ if (spec.getOpposite() != null) {
+ linkName = opposite?spec.getName():spec.getOpposite().getName();
+ multiple = opposite?spec.isMultiple():spec.getOpposite().isMultiple();
+ } else {
+ linkName = spec.getName();
+ multiple = spec.isMultiple();
+ }
+ if (prevLinkedIssue != null) {
+ IssueChange change = new IssueChange();
+ change.setIssue(prevLinkedIssue);
+ change.setUser(SecurityUtils.getUser());
+ String prevIssueSummary = getIssueSummary(prevLinkedIssue, issue);
+ if (multiple)
+ change.setData(new IssueLinkRemoveData(linkName, prevIssueSummary));
+ else
+ change.setData(new IssueLinkChangeData(linkName, prevIssueSummary, null));
+ save(change);
+ }
+ if (linkedIssue != null) {
+ IssueChange change = new IssueChange();
+ change.setIssue(linkedIssue);
+ change.setUser(SecurityUtils.getUser());
+ String issueSummary = getIssueSummary(linkedIssue, issue);
+ if (multiple)
+ change.setData(new IssueLinkAddData(linkName, issueSummary));
+ else
+ change.setData(new IssueLinkChangeData(linkName, null, issueSummary));
+ save(change);
+ }
+ }
+
+ @Nullable
+ private String getIssueSummary(Issue issue, @Nullable Issue linkedIssue) {
+ if (linkedIssue != null) {
+ if (linkedIssue.getNumberScope().equals(issue.getNumberScope()))
+ return linkedIssue.getNumberAndTitle();
+ else
+ return linkedIssue.getProject() + linkedIssue.getNumberAndTitle();
+ } else {
+ return null;
+ }
+ }
+
+ @Transactional
+ @Override
+ public void addLink(LinkSpec spec, Issue issue, Issue linkedIssue, boolean opposite) {
+ Collection<Issue> linkedIssues = issue.findLinkedIssues(spec, opposite);
+ linkedIssues.add(linkedIssue);
+ issueLinkManager.syncLinks(spec, issue, linkedIssues, opposite);
+
+ IssueChange change = new IssueChange();
+ change.setIssue(issue);
+ change.setUser(SecurityUtils.getUser());
+
+ String linkName = opposite?spec.getOpposite().getName():spec.getName();
+ IssueLinkAddData data = new IssueLinkAddData(linkName, getIssueSummary(issue, linkedIssue));
+ change.setData(data);
+ save(change);
+
+ logLinkedSideChange(spec, issue, null, linkedIssue, opposite);
+ }
+
+ @Transactional
+ @Override
+ public void removeLink(LinkSpec spec, Issue issue, Issue linkedIssue, boolean opposite) {
+ Collection<Issue> linkedIssues = issue.findLinkedIssues(spec, opposite);
+ linkedIssues.remove(linkedIssue);
+ issueLinkManager.syncLinks(spec, issue, linkedIssues, opposite);
+
+ IssueChange change = new IssueChange();
+ change.setIssue(issue);
+ change.setUser(SecurityUtils.getUser());
+
+ String linkName = opposite?spec.getOpposite().getName():spec.getName();
+ IssueLinkRemoveData data = new IssueLinkRemoveData(linkName, getIssueSummary(issue, linkedIssue));
+ change.setData(data);
+ save(change);
+
+ logLinkedSideChange(spec, issue, linkedIssue, null, opposite);
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueLinkManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueLinkManager.java
new file mode 100644
index 0000000000..13911947ab
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueLinkManager.java
@@ -0,0 +1,78 @@
+package io.onedev.server.entitymanager.impl;
+
+import java.util.Collection;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import io.onedev.server.entitymanager.IssueLinkManager;
+import io.onedev.server.model.Issue;
+import io.onedev.server.model.IssueLink;
+import io.onedev.server.model.LinkSpec;
+import io.onedev.server.persistence.annotation.Transactional;
+import io.onedev.server.persistence.dao.BaseEntityManager;
+import io.onedev.server.persistence.dao.Dao;
+
+@Singleton
+public class DefaultIssueLinkManager extends BaseEntityManager<IssueLink> implements IssueLinkManager {
+
+ @Inject
+ public DefaultIssueLinkManager(Dao dao) {
+ super(dao);
+ }
+
+ @Transactional
+ @Override
+ public void syncLinks(LinkSpec spec, Issue issue, Collection<Issue> linkedIssues, boolean opposite) {
+ if (spec.getOpposite() != null) {
+ Collection<IssueLink> links = opposite?issue.getSourceLinks():issue.getTargetLinks();
+ for (IssueLink link: links) {
+ if (!linkedIssues.contains(link.getLinked(issue)))
+ delete(link);
+ }
+ for (Issue linkedIssue: linkedIssues) {
+ boolean found = false;
+ for (IssueLink link: links) {
+ if (link.getLinked(issue).equals(linkedIssue)) {
+ found = true;
+ break;
+ }
+ }
+ if (!found) {
+ IssueLink link = new IssueLink();
+ link.setSpec(spec);
+ if (opposite) {
+ link.setSource(linkedIssue);
+ link.setTarget(issue);
+ } else {
+ link.setSource(issue);
+ link.setTarget(linkedIssue);
+ }
+ save(link);
+ }
+ }
+ } else {
+ for (IssueLink link: issue.getLinks()) {
+ if (!linkedIssues.contains(link.getLinked(issue)))
+ delete(link);
+ }
+ for (Issue linkedIssue: linkedIssues) {
+ boolean found = false;
+ for (IssueLink link: issue.getLinks()) {
+ if (link.getLinked(issue).equals(linkedIssue)) {
+ found = true;
+ break;
+ }
+ }
+ if (!found) {
+ IssueLink link = new IssueLink();
+ link.setSpec(spec);
+ link.setSource(issue);
+ link.setTarget(linkedIssue);
+ save(link);
+ }
+ }
+ }
+ }
+
+}
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 ad54a5cfef..294df0b64f 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
@@ -22,6 +22,7 @@ import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
+import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.util.lang.Objects;
import org.hibernate.criterion.MatchMode;
import org.hibernate.criterion.Order;
@@ -699,7 +700,15 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
@Override
public List<Issue> query(Project project, String term, int count) {
EntityCriteria<Issue> criteria = newCriteria();
-
+
+ if (term.contains("#")) {
+ String projectPath = StringUtils.substringBefore(term, "#");
+ Project specifiedProject = projectManager.find(projectPath);
+ if (specifiedProject != null && SecurityUtils.canAccess(specifiedProject)) {
+ project = specifiedProject;
+ term = StringUtils.substringAfter(term, "#");
+ }
+ }
Set<Project> projects = Sets.newHashSet(project);
projects.addAll(project.getForkParents().stream().filter(it->SecurityUtils.canAccess(it)).collect(Collectors.toSet()));
criteria.add(Restrictions.in(Issue.PROP_PROJECT, projects));
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultLinkSpecManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultLinkSpecManager.java
new file mode 100644
index 0000000000..852c4c4de0
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultLinkSpecManager.java
@@ -0,0 +1,32 @@
+package io.onedev.server.entitymanager.impl;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.hibernate.criterion.Restrictions;
+
+import io.onedev.server.entitymanager.LinkSpecManager;
+import io.onedev.server.model.LinkSpec;
+import io.onedev.server.persistence.annotation.Sessional;
+import io.onedev.server.persistence.dao.BaseEntityManager;
+import io.onedev.server.persistence.dao.Dao;
+import io.onedev.server.persistence.dao.EntityCriteria;
+
+@Singleton
+public class DefaultLinkSpecManager extends BaseEntityManager<LinkSpec> implements LinkSpecManager {
+
+ @Inject
+ public DefaultLinkSpecManager(Dao dao) {
+ super(dao);
+ }
+
+ @Sessional
+ @Override
+ public LinkSpec find(String name) {
+ EntityCriteria<LinkSpec> criteria = newCriteria();
+ criteria.add(Restrictions.ilike("name", name));
+ criteria.setCacheable(true);
+ return find(criteria);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
index 2b28bd42a8..ba9e595907 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
@@ -31,6 +31,7 @@ import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
+import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.util.lang.Objects;
import org.eclipse.jgit.lib.CommitBuilder;
import org.eclipse.jgit.lib.ObjectId;
@@ -1016,6 +1017,15 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> im
EntityCriteria<PullRequest> criteria = newCriteria();
+ if (term.contains("#")) {
+ String projectPath = StringUtils.substringBefore(term, "#");
+ Project specifiedProject = projectManager.find(projectPath);
+ if (specifiedProject != null && SecurityUtils.canAccess(specifiedProject)) {
+ project = specifiedProject;
+ term = StringUtils.substringAfter(term, "#");
+ }
+ }
+
Set<Project> projects = Sets.newHashSet(project);
projects.addAll(project.getForkParents().stream().filter(it->SecurityUtils.canReadCode(it)).collect(Collectors.toSet()));
criteria.add(Restrictions.in(PullRequest.PROP_TARGET_PROJECT, projects));
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 03dea68ac1..3ba0858083 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
@@ -3317,4 +3317,71 @@ public class DataMigrator {
}
+ // Migrate to 5.5.0
+ private void migrate71(File dataDir, Stack<Integer> versions) {
+ Map<String, String> issueScopes = new HashMap<>();
+ Map<Pair<String, String>, String> issueIds = new HashMap<>();
+ Map<Pair<String, String>, String> buildIds = new HashMap<>();
+ Map<Pair<String, String>, String> pullRequestIds = new HashMap<>();
+
+ for (File file: dataDir.listFiles()) {
+ if (file.getName().startsWith("Issues.xml")) {
+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);
+ for (Element element: dom.getRootElement().elements()) {
+ String issueId = element.elementTextTrim("id");
+ String numberScope = element.elementTextTrim("numberScope");
+ issueScopes.put(issueId, numberScope);
+ issueIds.put(new Pair<>(numberScope, element.elementTextTrim("number")), issueId);
+ }
+ } else if (file.getName().startsWith("Builds.xml")) {
+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);
+ for (Element element: dom.getRootElement().elements()) {
+ String buildId = element.elementTextTrim("id");
+ String numberScope = element.elementTextTrim("numberScope");
+ String number = element.elementTextTrim("number");
+ buildIds.put(new Pair<>(numberScope, number), buildId);
+ }
+ } else if (file.getName().startsWith("PullRequests.xml")) {
+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);
+ for (Element element: dom.getRootElement().elements()) {
+ String pullRequestId = element.elementTextTrim("id");
+ String numberScope = element.elementTextTrim("numberScope");
+ String number = element.elementTextTrim("number");
+ pullRequestIds.put(new Pair<>(numberScope, number), pullRequestId);
+ }
+ }
+ }
+
+ for (File file: dataDir.listFiles()) {
+ if (file.getName().startsWith("IssueFields.xml")) {
+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);
+ for (Element element: dom.getRootElement().elements()) {
+ String issueId = element.elementTextTrim("issue");
+ String type = element.elementText("type").trim();
+ String value = element.elementTextTrim("value");
+ if (type.equals("Issue")) {
+ String fieldIssueId = issueIds.get(new Pair<>(issueScopes.get(issueId), value));
+ if (fieldIssueId != null)
+ element.element("value").setText(fieldIssueId);
+ else
+ element.detach();
+ } else if (type.equals("Build")) {
+ String fieldBuildId = buildIds.get(new Pair<>(issueScopes.get(issueId), value));
+ if (fieldBuildId != null)
+ element.element("value").setText(fieldBuildId);
+ else
+ element.detach();
+ } else if (type.equals("Pull Request")) {
+ String fieldPullRequestId = pullRequestIds.get(new Pair<>(issueScopes.get(issueId), value));
+ if (fieldPullRequestId != null)
+ element.element("value").setText(fieldPullRequestId);
+ else
+ element.detach();
+ }
+ }
+ dom.writeToFile(file, false);
+ }
+ }
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/model/Issue.java b/server-core/src/main/java/io/onedev/server/model/Issue.java
index 7ba55f1051..ad0822c09c 100644
--- a/server-core/src/main/java/io/onedev/server/model/Issue.java
+++ b/server-core/src/main/java/io/onedev/server/model/Issue.java
@@ -250,6 +250,20 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentSt
@OneToMany(mappedBy="issue", cascade=CascadeType.REMOVE)
private Collection<IssueWatch> watches = new ArrayList<>();
+ @OneToMany(mappedBy=IssueLink.PROP_TARGET, cascade=CascadeType.REMOVE)
+ private Collection<IssueLink> sourceLinks = new ArrayList<>();
+
+ @OneToMany(mappedBy=IssueLink.PROP_SOURCE, cascade=CascadeType.REMOVE)
+ private Collection<IssueLink> targetLinks = new ArrayList<>();
+
+ private transient List<IssueLink> sortedSourceLinks;
+
+ private transient List<IssueLink> sortedTargetLinks;
+
+ private transient Collection<IssueLink> links;
+
+ private transient List<IssueLink> sortedLinks;
+
private transient List<RevCommit> commits;
private transient List<PullRequest> pullRequests;
@@ -443,6 +457,55 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentSt
this.fields = fields;
}
+ public Collection<IssueLink> getSourceLinks() {
+ return sourceLinks;
+ }
+
+ public void setSourceLinks(Collection<IssueLink> sourceLinks) {
+ this.sourceLinks = sourceLinks;
+ }
+
+ public Collection<IssueLink> getTargetLinks() {
+ return targetLinks;
+ }
+
+ public void setTargetLinks(Collection<IssueLink> targetLinks) {
+ this.targetLinks = targetLinks;
+ }
+
+ public List<IssueLink> getSortedSourceLinks() {
+ if (sortedSourceLinks == null) {
+ sortedSourceLinks = new ArrayList<>(sourceLinks);
+ Collections.sort(sortedSourceLinks);
+ }
+ return sortedSourceLinks;
+ }
+
+ public List<IssueLink> getSortedTargetLinks() {
+ if (sortedTargetLinks == null) {
+ sortedTargetLinks = new ArrayList<>(targetLinks);
+ Collections.sort(sortedTargetLinks);
+ }
+ return sortedTargetLinks;
+ }
+
+ public List<IssueLink> getSortedLinks() {
+ if (sortedLinks == null) {
+ sortedLinks = new ArrayList<>(getLinks());
+ Collections.sort(sortedLinks);
+ }
+ return sortedLinks;
+ }
+
+ public Collection<IssueLink> getLinks() {
+ if (links == null) {
+ links = new ArrayList<>();
+ links.addAll(sourceLinks);
+ links.addAll(targetLinks);
+ }
+ return links;
+ }
+
public boolean isVisitedAfter(Date date) {
User user = SecurityUtils.getUser();
if (user != null) {
@@ -731,7 +794,7 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentSt
return getSchedules().stream().map(it->it.getMilestone()).collect(Collectors.toList());
}
- public IssueSchedule addToMilestone(Milestone milestone) {
+ public IssueSchedule addSchedule(Milestone milestone) {
IssueSchedule schedule = new IssueSchedule();
schedule.setIssue(this);
schedule.setMilestone(milestone);
@@ -740,7 +803,7 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentSt
}
@Nullable
- public IssueSchedule removeFromMilestone(Milestone milestone) {
+ public IssueSchedule removeSchedule(Milestone milestone) {
for (Iterator<IssueSchedule> it = getSchedules().iterator(); it.hasNext();) {
IssueSchedule schedule = it.next();
if (schedule.getMilestone().equals(milestone)) {
@@ -779,4 +842,50 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentSt
return issueNumbers;
}
+ @Nullable
+ public Issue findLinkedIssue(LinkSpec spec, boolean opposite) {
+ if (spec.getOpposite() != null) {
+ if (opposite) {
+ for (IssueLink link: getSortedSourceLinks()) {
+ if (link.getSpec().equals(spec))
+ return link.getSource();
+ }
+ return null;
+ } else {
+ for (IssueLink link: getSortedTargetLinks()) {
+ if (link.getSpec().equals(spec))
+ return link.getTarget();
+ }
+ return null;
+ }
+ } else {
+ for (IssueLink link: getSortedLinks()) {
+ if (link.getSpec().equals(spec))
+ return link.getLinked(this);
+ }
+ return null;
+ }
+ }
+
+ public Collection<Issue> findLinkedIssues(LinkSpec spec, boolean opposite) {
+ if (spec.getOpposite() != null) {
+ if (opposite) {
+ return getSortedSourceLinks().stream()
+ .filter(it->it.getSpec().equals(spec))
+ .map(it->it.getSource())
+ .collect(Collectors.toList());
+ } else {
+ return getSortedTargetLinks().stream()
+ .filter(it->it.getSpec().equals(spec))
+ .map(it->it.getTarget())
+ .collect(Collectors.toList());
+ }
+ } else {
+ return getSortedLinks().stream()
+ .filter(it->it.getSpec().equals(spec))
+ .map(it->it.getLinked(this))
+ .collect(Collectors.toList());
+ }
+ }
+
}
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 c099345b54..632f6301c1 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
@@ -29,7 +29,7 @@ public class IssueChange extends AbstractEntity {
private User user;
@Column(nullable=false)
- private Date date;
+ private Date date = new Date();
@Lob
@Column(length=65535, nullable=false)
diff --git a/server-core/src/main/java/io/onedev/server/model/IssueLink.java b/server-core/src/main/java/io/onedev/server/model/IssueLink.java
new file mode 100644
index 0000000000..39d40f4f48
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/model/IssueLink.java
@@ -0,0 +1,65 @@
+package io.onedev.server.model;
+
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Index;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.UniqueConstraint;
+
+@Entity
+@Table(
+ indexes={@Index(columnList="o_source_id"), @Index(columnList="o_target_id"), @Index(columnList="o_spec_id")},
+ uniqueConstraints={@UniqueConstraint(columnNames={"o_source_id", "o_target_id", "o_spec_id"})})
+public class IssueLink extends AbstractEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final String PROP_SOURCE = "source";
+
+ public static final String PROP_TARGET = "target";
+
+ public static final String PROP_SPEC = "spec";
+
+ @ManyToOne(fetch=FetchType.LAZY)
+ @JoinColumn(nullable=false)
+ private Issue source;
+
+ @ManyToOne(fetch=FetchType.LAZY)
+ @JoinColumn(nullable=false)
+ private Issue target;
+
+ @ManyToOne(fetch=FetchType.LAZY)
+ @JoinColumn(nullable=false)
+ private LinkSpec spec;
+
+ public Issue getSource() {
+ return source;
+ }
+
+ public void setSource(Issue source) {
+ this.source = source;
+ }
+
+ public Issue getTarget() {
+ return target;
+ }
+
+ public void setTarget(Issue target) {
+ this.target = target;
+ }
+
+ public LinkSpec getSpec() {
+ return spec;
+ }
+
+ public void setSpec(LinkSpec spec) {
+ this.spec = spec;
+ }
+
+ public Issue getLinked(Issue issue) {
+ return issue.equals(source)?target:source;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/model/LinkSpec.java b/server-core/src/main/java/io/onedev/server/model/LinkSpec.java
new file mode 100644
index 0000000000..90d73d2ca5
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/model/LinkSpec.java
@@ -0,0 +1,64 @@
+package io.onedev.server.model;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Lob;
+import javax.persistence.OneToMany;
+
+import org.hibernate.validator.constraints.NotEmpty;
+
+import io.onedev.server.model.support.issue.LinkSpecOpposite;
+import io.onedev.server.web.editable.annotation.Editable;
+
+@Entity
+@Editable
+public class LinkSpec extends AbstractEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ @Column(nullable=false, unique=true)
+ private String name;
+
+ private boolean multiple;
+
+ @Lob
+ @Column(length=65535)
+ private LinkSpecOpposite opposite;
+
+ @OneToMany(mappedBy=IssueLink.PROP_SPEC, cascade=CascadeType.REMOVE)
+ private Collection<IssueLink> links = new ArrayList<>();
+
+ @Editable(order=100, description="Name of the link")
+ @NotEmpty
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ @Editable(order=150, name="Multiple", description="Whether or not multiple issues can be linked")
+ public boolean isMultiple() {
+ return multiple;
+ }
+
+ public void setMultiple(boolean multiple) {
+ this.multiple = multiple;
+ }
+
+ @Editable(order=175, name="Asymmetric", description="Whether or not the link is asymmetric. A asymmetric link has different "
+ + "meaning from different side. For instance a 'parent-child' link is asymmetric, while a 'related to' link is symmetric")
+ public LinkSpecOpposite getOpposite() {
+ return opposite;
+ }
+
+ public void setOpposite(LinkSpecOpposite opposite) {
+ this.opposite = opposite;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/LinkSpecOpposite.java b/server-core/src/main/java/io/onedev/server/model/support/issue/LinkSpecOpposite.java
new file mode 100644
index 0000000000..d73f960b6f
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/LinkSpecOpposite.java
@@ -0,0 +1,40 @@
+package io.onedev.server.model.support.issue;
+
+import java.io.Serializable;
+
+import org.hibernate.validator.constraints.NotEmpty;
+
+import io.onedev.server.web.editable.annotation.Editable;
+
+@Editable
+public class LinkSpecOpposite implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private String name;
+
+ private boolean multiple;
+
+ @Editable(order=100, name="Name On the Other Side", description="Name of the link on the other side. "
+ + "For instance if name is <tt>child issues</tt>, name on the other side can be <tt>parent issue</tt>")
+ @NotEmpty
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ @Editable(order=200, name="Multiple On the Other Side", description="Whether or not multiple issues can be linked "
+ + "on the other side. For instance child issues on the other side means parent issue, and multiple should "
+ + "be false on that side if only one parent is allowed")
+ public boolean isMultiple() {
+ return multiple;
+ }
+
+ public void setMultiple(boolean multiple) {
+ this.multiple = multiple;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueLinkAddData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueLinkAddData.java
new file mode 100644
index 0000000000..189811ce2a
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueLinkAddData.java
@@ -0,0 +1,49 @@
+package io.onedev.server.model.support.issue.changedata;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+import io.onedev.server.model.Group;
+import io.onedev.server.model.User;
+import io.onedev.server.util.CommentAware;
+
+public class IssueLinkAddData extends IssueChangeData {
+
+ private static final long serialVersionUID = 1L;
+
+ private final String linkName;
+
+ private final String issueSummary;
+
+ public IssueLinkAddData(String linkName, String issueSummary) {
+ this.linkName = linkName;
+ this.issueSummary = issueSummary;
+ }
+
+ @Override
+ public String getActivity() {
+ return "added '" + linkName + "': " + issueSummary;
+ }
+
+ @Override
+ public CommentAware getCommentAware() {
+ return null;
+ }
+
+ @Override
+ public Map<String, Collection<User>> getNewUsers() {
+ return new HashMap<>();
+ }
+
+ @Override
+ public Map<String, Group> getNewGroups() {
+ return new HashMap<>();
+ }
+
+ @Override
+ public boolean affectsListing() {
+ return true;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueLinkChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueLinkChangeData.java
new file mode 100644
index 0000000000..52e7433619
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueLinkChangeData.java
@@ -0,0 +1,64 @@
+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 io.onedev.server.model.Group;
+import io.onedev.server.model.User;
+import io.onedev.server.notification.ActivityDetail;
+import io.onedev.server.util.CommentAware;
+
+public class IssueLinkChangeData extends IssueChangeData {
+
+ private static final long serialVersionUID = 1L;
+
+ private final String linkName;
+
+ private final String oldIssueSummary;
+
+ private final String newIssueSummary;
+
+ public IssueLinkChangeData(String linkName, @Nullable String oldIssueSummary, @Nullable String newIssueSummary) {
+ this.linkName = linkName;
+ this.oldIssueSummary = oldIssueSummary;
+ this.newIssueSummary = newIssueSummary;
+ }
+
+ @Override
+ public String getActivity() {
+ return "changed '" + linkName + "'";
+ }
+
+ @Override
+ public CommentAware getCommentAware() {
+ return null;
+ }
+
+ @Override
+ public Map<String, Collection<User>> getNewUsers() {
+ return new HashMap<>();
+ }
+
+ @Override
+ public Map<String, Group> getNewGroups() {
+ return new HashMap<>();
+ }
+
+ @Override
+ public boolean affectsListing() {
+ return true;
+ }
+
+ @Override
+ public ActivityDetail getActivityDetail() {
+ Map<String, String> oldFieldValues = new HashMap<>();
+ oldFieldValues.put(linkName, oldIssueSummary);
+ Map<String, String> newFieldValues = new HashMap<>();
+ newFieldValues.put(linkName, newIssueSummary);
+ return ActivityDetail.compare(oldFieldValues, newFieldValues, true);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueLinkRemoveData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueLinkRemoveData.java
new file mode 100644
index 0000000000..7ab16eb80f
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueLinkRemoveData.java
@@ -0,0 +1,49 @@
+package io.onedev.server.model.support.issue.changedata;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+import io.onedev.server.model.Group;
+import io.onedev.server.model.User;
+import io.onedev.server.util.CommentAware;
+
+public class IssueLinkRemoveData extends IssueChangeData {
+
+ private static final long serialVersionUID = 1L;
+
+ private final String linkName;
+
+ private final String issueSummary;
+
+ public IssueLinkRemoveData(String linkName, String issueSummary) {
+ this.linkName = linkName;
+ this.issueSummary = issueSummary;
+ }
+
+ @Override
+ public String getActivity() {
+ return "removed '" + linkName + "': " + issueSummary;
+ }
+
+ @Override
+ public CommentAware getCommentAware() {
+ return null;
+ }
+
+ @Override
+ public Map<String, Collection<User>> getNewUsers() {
+ return new HashMap<>();
+ }
+
+ @Override
+ public Map<String, Group> getNewGroups() {
+ return new HashMap<>();
+ }
+
+ @Override
+ public boolean affectsListing() {
+ return true;
+ }
+
+}
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 99d39734ce..4ae3a3cb9f 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
@@ -28,6 +28,7 @@ import io.onedev.server.web.page.admin.group.profile.GroupProfilePage;
import io.onedev.server.web.page.admin.issuesetting.defaultboard.DefaultBoardListPage;
import io.onedev.server.web.page.admin.issuesetting.fieldspec.IssueFieldListPage;
import io.onedev.server.web.page.admin.issuesetting.issuetemplate.IssueTemplateListPage;
+import io.onedev.server.web.page.admin.issuesetting.linkspec.LinkSpecListPage;
import io.onedev.server.web.page.admin.issuesetting.statespec.IssueStateListPage;
import io.onedev.server.web.page.admin.issuesetting.transitionspec.StateTransitionListPage;
import io.onedev.server.web.page.admin.mailsetting.MailSettingPage;
@@ -256,6 +257,7 @@ public class OneUrlMapper extends CompoundRequestMapper {
add(new DynamicPathPageMapper("administration/settings/issue-states", IssueStateListPage.class));
add(new DynamicPathPageMapper("administration/settings/state-transitions", StateTransitionListPage.class));
add(new DynamicPathPageMapper("administration/settings/issue-boards", DefaultBoardListPage.class));
+ add(new DynamicPathPageMapper("administration/settings/issue-links", LinkSpecListPage.class));
add(new DynamicPathPageMapper("administration/settings/issue-templates", IssueTemplateListPage.class));
add(new DynamicPathPageMapper("administration/settings/${setting}", ContributedAdministrationSettingPage.class));
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/bootstrap/css/bootstrap-custom.css b/server-core/src/main/java/io/onedev/server/web/asset/bootstrap/css/bootstrap-custom.css
index 8d4c9373ca..da2cd433c1 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/bootstrap/css/bootstrap-custom.css
+++ b/server-core/src/main/java/io/onedev/server/web/asset/bootstrap/css/bootstrap-custom.css
@@ -1700,9 +1700,6 @@ input[type="radio"], input[type="checkbox"] {
.nav.nav-tabs.nav-tabs-line .nav-item {
margin: 0 0 -1px 0;
}
-.nav.nav-tabs.nav-tabs-line .nav-item:first-child .nav-link {
- margin-left: 0;
-}
.nav.nav-tabs.nav-tabs-line .nav-link:hover:not(.disabled),
.nav.nav-tabs.nav-tabs-line .active .nav-link,
.nav.nav-tabs.nav-tabs-line .nav-link.active,
@@ -1715,7 +1712,7 @@ input[type="radio"], input[type="checkbox"] {
border: 0;
border-bottom: 1px solid transparent;
padding: 0.85rem 0;
- margin: 0 1rem;
+ margin-right: 2rem;
}
.nav.nav-tabs.nav-tabs-line.nav-tabs-line-2x {
border-bottom-width: 2px;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/choice/BuildChoiceProvider.java b/server-core/src/main/java/io/onedev/server/web/component/build/choice/BuildChoiceProvider.java
index f7e7a686d2..12caacd588 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/choice/BuildChoiceProvider.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/choice/BuildChoiceProvider.java
@@ -44,6 +44,8 @@ public class BuildChoiceProvider extends ChoiceProvider<Build> {
.key("jobName").value(HtmlEscape.escapeHtml5(choice.getJobName()));
if (choice.getVersion() != null)
writer.key("version").value(HtmlEscape.escapeHtml5(choice.getVersion()));
+ if (!choice.getNumberScope().equals(projectModel.getObject().getForkRoot()))
+ writer.key("project").value(HtmlEscape.escapeHtml5(choice.getProject().getPath()));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/choice/build-choice.js b/server-core/src/main/java/io/onedev/server/web/component/build/choice/build-choice.js
index 286e3617db..6213dde334 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/choice/build-choice.js
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/choice/build-choice.js
@@ -1,9 +1,12 @@
onedev.server.buildChoiceFormatter = {
formatBuild: function(build) {
+ var buildNumber = "#" + build.number;
+ if (build.project)
+ buildNumber = build.project + buildNumber;
if (build.version)
- return "<span class='build'>#" + build.number + " (" + build.version + ") : " + build.jobName + "</span>";
+ return buildNumber + " (" + build.version + ") : " + build.jobName;
else
- return "<span class='build'>#" + build.number + " : " + build.jobName + "</span>";
+ return buildNumber + " : " + build.jobName;
},
formatSelection: function(build) {
return onedev.server.buildChoiceFormatter.formatBuild(build);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueAddChoice.java b/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueAddChoice.java
new file mode 100644
index 0000000000..dfbac2f2e0
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueAddChoice.java
@@ -0,0 +1,33 @@
+package io.onedev.server.web.component.issue.choice;
+
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+
+import io.onedev.server.model.Issue;
+import io.onedev.server.web.component.select2.SelectToAddChoice;
+
+@SuppressWarnings("serial")
+public abstract class IssueAddChoice extends SelectToAddChoice<Issue> {
+
+ public IssueAddChoice(String id, IssueChoiceProvider choiceProvider) {
+ super(id, choiceProvider);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ getSettings().setPlaceholder("Add Issue...");
+ getSettings().setFormatResult("onedev.server.issueChoiceFormatter.formatResult");
+ getSettings().setFormatSelection("onedev.server.issueChoiceFormatter.formatSelection");
+ getSettings().setEscapeMarkup("onedev.server.issueChoiceFormatter.escapeMarkup");
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+
+ response.render(JavaScriptHeaderItem.forReference(new IssueChoiceResourceReference()));
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueSingleChoice.java b/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueChoice.java
similarity index 88%
rename from server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueSingleChoice.java
rename to server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueChoice.java
index 7ac692076c..e532dcaf86 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueSingleChoice.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueChoice.java
@@ -8,9 +8,9 @@ import io.onedev.server.model.Issue;
import io.onedev.server.web.component.select2.Select2Choice;
@SuppressWarnings("serial")
-public class IssueSingleChoice extends Select2Choice<Issue> {
+public class IssueChoice extends Select2Choice<Issue> {
- public IssueSingleChoice(String id, IModel<Issue> model, IssueChoiceProvider choiceProvider) {
+ public IssueChoice(String id, IModel<Issue> model, IssueChoiceProvider choiceProvider) {
super(id, model, choiceProvider);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueChoiceProvider.java b/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueChoiceProvider.java
index 263312c8fa..5fa41bc6e4 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueChoiceProvider.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/choice/IssueChoiceProvider.java
@@ -43,6 +43,8 @@ public class IssueChoiceProvider extends ChoiceProvider<Issue> {
.key("id").value(choice.getId())
.key("number").value(choice.getNumber())
.key("title").value(Emojis.getInstance().apply(HtmlEscape.escapeHtml5(choice.getTitle())));
+ if (!choice.getNumberScope().equals(projectModel.getObject().getForkRoot()))
+ writer.key("project").value(HtmlEscape.escapeHtml5(choice.getProject().getPath()));
}
@Override
@@ -56,7 +58,7 @@ public class IssueChoiceProvider extends ChoiceProvider<Issue> {
}
return issues;
}
-
+
@Override
public void query(String term, int page, Response<Issue> response) {
int count = (page+1) * WebConstants.PAGE_SIZE + 1;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/choice/issue-choice.js b/server-core/src/main/java/io/onedev/server/web/component/issue/choice/issue-choice.js
index decae4233c..ffbcf825d3 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/choice/issue-choice.js
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/choice/issue-choice.js
@@ -1,12 +1,16 @@
onedev.server.issueChoiceFormatter = {
+ formatIssue: function(issue) {
+ if (issue.project)
+ return issue.project + "#" + issue.number + " " + issue.title;
+ else
+ return "#" + issue.number + " " + issue.title;
+ },
formatSelection: function(issue) {
- return "#" + issue.number + " " + issue.title;
+ return onedev.server.issueChoiceFormatter.formatIssue(issue);
},
-
formatResult: function(issue) {
- return "<div class='issue'>#" + issue.number + " " + issue.title + "</div>";
+ return onedev.server.issueChoiceFormatter.formatIssue(issue);
},
-
escapeMarkup: function(m) {
return m;
},
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 ab89c0d564..f232ca7578 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
@@ -212,66 +212,67 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {
else
item.add(new Label("value", value));
} else if (getField().getType().equals(FieldSpec.ISSUE)) {
- Issue issue = OneDev.getInstance(IssueManager.class)
- .find(getIssue().getProject(), Long.valueOf(value));
+ Issue issue = OneDev.getInstance(IssueManager.class).get(Long.valueOf(value));
if (issue != null) {
Fragment linkFrag = new Fragment("value", "linkFrag", FieldValuesPanel.this);
Link<Void> link = new BookmarkablePageLink<Void>("link", IssueActivitiesPage.class,
IssueActivitiesPage.paramsOf(issue));
- link.add(new Label("label", "#" + issue.getNumber()));
+ if (issue.getNumberScope().equals(getIssue().getProject().getForkRoot()))
+ link.add(new Label("label", "#" + issue.getNumber()));
+ else
+ link.add(new Label("label", issue.getFQN().toString()));
linkFrag.add(link);
item.add(linkFrag);
} else {
- item.add(new Label("value", "#" + value));
+ item.add(new Label("value", "<i>Not Found</i>").setEscapeModelStrings(false));
}
} else if (getField().getType().equals(FieldSpec.BUILD)) {
- Build build = OneDev.getInstance(BuildManager.class)
- .find(getIssue().getProject(), Long.valueOf(value));
+ Build build = OneDev.getInstance(BuildManager.class).get(Long.valueOf(value));
if (build != null) {
Fragment linkFrag = new Fragment("value", "linkFrag", FieldValuesPanel.this);
Link<Void> link = new BookmarkablePageLink<Void>("link",
BuildDashboardPage.class, BuildDashboardPage.paramsOf(build));
String buildInfo = "#" + build.getNumber();
+ if (build.getNumberScope().equals(getIssue().getProject().getForkRoot()))
+ buildInfo = "#" + build.getNumber();
+ else
+ buildInfo = build.getFQN().toString();
+
if (build.getVersion() != null)
buildInfo += " (" + build.getVersion() + ")";
link.add(new Label("label", buildInfo));
linkFrag.add(link);
item.add(linkFrag);
} else {
- item.add(new Label("value", "#" + value));
+ item.add(new Label("value", "<i>Not Found</i>").setEscapeModelStrings(false));
}
} else if (getField().getType().equals(FieldSpec.PULL_REQUEST)) {
- PullRequest request = OneDev.getInstance(PullRequestManager.class)
- .find(getIssue().getProject(), Long.valueOf(value));
- if (request != null && SecurityUtils.canReadCode(request.getTargetProject())) {
+ PullRequest request = OneDev.getInstance(PullRequestManager.class).get(Long.valueOf(value));
+ if (request != null) {
Fragment linkFrag = new Fragment("value", "linkFrag", FieldValuesPanel.this);
Link<Void> link = new BookmarkablePageLink<Void>("link", PullRequestActivitiesPage.class,
PullRequestActivitiesPage.paramsOf(request));
- link.add(new Label("label", "#" + request.getNumber()));
+ if (request.getNumberScope().equals(getIssue().getProject().getForkRoot()))
+ link.add(new Label("label", "#" + request.getNumber()));
+ else
+ link.add(new Label("label", request.getFQN().toString()));
linkFrag.add(link);
item.add(linkFrag);
} else {
- item.add(new Label("value", "#" + value));
+ item.add(new Label("value", "<i>Not Found</i>").setEscapeModelStrings(false));
}
} else if (getField().getType().equals(FieldSpec.COMMIT)) {
if (ObjectId.isId(value)) {
- if (SecurityUtils.canReadCode(getIssue().getProject())) {
- Fragment fragment = new Fragment("value", "commitFrag", FieldValuesPanel.this);
- Project project = getIssue().getProject();
- CommitDetailPage.State commitState = new CommitDetailPage.State();
- commitState.revision = value;
- PageParameters params = CommitDetailPage.paramsOf(project, commitState);
- Link<Void> hashLink = new BookmarkablePageLink<Void>("hashLink", CommitDetailPage.class, params);
- fragment.add(hashLink);
- hashLink.add(new Label("hash", GitUtils.abbreviateSHA(value)));
- fragment.add(new CopyToClipboardLink("copyHash", Model.of(value)));
- item.add(fragment);
- } else {
- Fragment fragment = new Fragment("value", "notAccessibleCommitFrag", FieldValuesPanel.this);
- fragment.add(new Label("hash", GitUtils.abbreviateSHA(value)));
- fragment.add(new CopyToClipboardLink("copyHash", Model.of(value)));
- item.add(fragment);
- }
+ Fragment fragment = new Fragment("value", "commitFrag", FieldValuesPanel.this);
+ Project project = getIssue().getProject();
+ CommitDetailPage.State commitState = new CommitDetailPage.State();
+ commitState.revision = value;
+ PageParameters params = CommitDetailPage.paramsOf(project, commitState);
+ Link<Void> hashLink = new BookmarkablePageLink<Void>("hashLink", CommitDetailPage.class, params);
+ fragment.add(hashLink);
+ hashLink.add(new Label("hash", GitUtils.abbreviateSHA(value)));
+ fragment.add(new CopyToClipboardLink("copyHash", Model.of(value)));
+ item.add(fragment);
} else {
item.add(new Label("value", value));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
index 211704adfe..f5a3bc6395 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
@@ -1122,7 +1122,7 @@ public abstract class IssueListPanel extends Panel {
else if (getProject().equals(issue.getProject()))
label = "#" + issue.getNumber();
else
- label = issue.getProject().getPath().substring(getProject().getPath().length()+1) + "#" + issue.getNumber();
+ label = issue.getProject() + "#" + issue.getNumber();
ActionablePageLink<Void> numberLink;
fragment.add(numberLink = new ActionablePageLink<Void>("number",
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.html
index 07b01a1850..c48e5abd84 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.html
@@ -13,11 +13,11 @@
<div wicket:id="milestones" class="milestones">
<div class="head">Milestones</div>
<ul class="body list-unstyled mb-0">
- <li wicket:id="milestones">
- <div class="d-flex align-items-center">
- <a wicket:id="link" class="mr-3"><span wicket:id="label"></span></a>
- <span wicket:id="status" class="status mr-3"></span>
- <a wicket:id="delete" class="btn btn-icon btn-xs btn-light btn-hover-danger ml-auto flex-shrink-0" title="Change milestone"><wicket:svg href="trash" class="icon icon-sm"></wicket:svg></a>
+ <li wicket:id="milestones" class="bg-light rounded p-3">
+ <div class="d-flex">
+ <a wicket:id="link" class="mr-2"><span wicket:id="label"></span></a>
+ <a wicket:id="delete" class="mr-2 flex-shrink-0" title="Change milestone"><wicket:svg href="trash" class="icon icon-sm"></wicket:svg></a>
+ <span wicket:id="status" class="status ml-auto"></span>
</div>
<div wicket:id="progress" class="mt-3"></div>
</li>
@@ -28,6 +28,9 @@
</wicket:enclosure>
</ul>
</div>
+ <div wicket:id="links" class="links">
+ <wicket:container wicket:id="content"></wicket:container>
+ </div>
<div wicket:id="votes" class="votes">
<div class="head">
Issue Votes (<span wicket:id="count"></span>)
@@ -55,4 +58,34 @@
<wicket:fragment wicket:id="nonEmptyValuesFrag">
<div wicket:id="values" class="value"><span wicket:id="value"></span></div>
</wicket:fragment>
+ <wicket:fragment wicket:id="singleLinkFrag">
+ <div class="head d-flex align-items-center">
+ <span wicket:id="name" class="flex-shrink-0 mr-2"></span>
+ <a wicket:id="edit" title="Edit" class="flex-grow-1 text-right"><wicket:svg href="gear" class="icon icon-sm"/></a>
+ </div>
+ <div wicket:id="body" class="body"></div>
+ </wicket:fragment>
+ <wicket:fragment wicket:id="linkedIssueFrag">
+ <div class="bg-light rounded p-3">
+ <div class="d-flex number-and-state mb-2">
+ <a wicket:id="number" class="mr-2"><span wicket:id="label"></span></a>
+ <a wicket:id="delete" class="mr-2"><wicket:svg href="trash" class="icon icon-sm"/></a>
+ <span wicket:id="state" class="ml-auto"></span>
+ </div>
+ <div class="title d-flex text-nowrap">
+ <a wicket:id="title" class="text-truncate"><span wicket:id="label"></span></a>
+ </div>
+ </div>
+ </wicket:fragment>
+ <wicket:fragment wicket:id="multipleLinksFrag">
+ <div wicket:id="name" class="head d-flex align-items-center"></div>
+ <ul class="body linked-issues list-unstyled mb-0">
+ <li wicket:id="linkedIssues"></li>
+ <wicket:enclosure>
+ <li class="add">
+ <input wicket:id="add" type="hidden" class="form-control">
+ </li>
+ </wicket:enclosure>
+ </ul>
+ </wicket:fragment>
</wicket:panel>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java
index 923a985c4a..8755e8df97 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java
@@ -1,5 +1,6 @@
package io.onedev.server.web.component.issue.side;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -9,6 +10,8 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
+import javax.annotation.Nullable;
+
import org.apache.wicket.Component;
import org.apache.wicket.RestartResponseAtInterceptPageException;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -24,7 +27,9 @@ 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.Fragment;
import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.markup.repeater.RepeatingView;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
@@ -34,13 +39,16 @@ import com.google.common.collect.Lists;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.IssueChangeManager;
+import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.entitymanager.IssueVoteManager;
import io.onedev.server.entitymanager.IssueWatchManager;
+import io.onedev.server.entitymanager.LinkSpecManager;
import io.onedev.server.entityreference.Referenceable;
import io.onedev.server.model.AbstractEntity;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueVote;
import io.onedev.server.model.IssueWatch;
+import io.onedev.server.model.LinkSpec;
import io.onedev.server.model.Milestone;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
@@ -57,6 +65,10 @@ import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
import io.onedev.server.web.behavior.WebSocketObserver;
import io.onedev.server.web.component.entity.reference.ReferencePanel;
import io.onedev.server.web.component.entity.watches.EntityWatchesPanel;
+import io.onedev.server.web.component.floating.AlignPlacement;
+import io.onedev.server.web.component.issue.IssueStateBadge;
+import io.onedev.server.web.component.issue.choice.IssueAddChoice;
+import io.onedev.server.web.component.issue.choice.IssueChoiceProvider;
import io.onedev.server.web.component.issue.fieldvalues.FieldValuesPanel;
import io.onedev.server.web.component.issue.statestats.StateStatsBar;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
@@ -69,6 +81,8 @@ import io.onedev.server.web.component.select2.SelectToAddChoice;
import io.onedev.server.web.component.user.ident.Mode;
import io.onedev.server.web.component.user.ident.UserIdentPanel;
import io.onedev.server.web.component.user.list.SimpleUserListLink;
+import io.onedev.server.web.editable.InplacePropertyEditLink;
+import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;
import io.onedev.server.web.page.project.issues.milestones.MilestoneIssuesPage;
import io.onedev.server.web.page.simple.security.LoginPage;
@@ -85,6 +99,7 @@ public abstract class IssueSidePanel extends Panel {
protected void onBeforeRender() {
addOrReplace(newFieldsContainer());
addOrReplace(newMilestonesContainer());
+ addOrReplace(newLinksContainer());
addOrReplace(newVotesContainer());
addOrReplace(new EntityWatchesPanel("watches") {
@@ -193,6 +208,191 @@ public abstract class IssueSidePanel extends Panel {
};
}
+ private Component newLinksContainer() {
+ return new ListView<LinkSide>("links", new LoadableDetachableModel<List<LinkSide>>() {
+
+ @Override
+ protected List<LinkSide> load() {
+ List<LinkSide> links = new ArrayList<>();
+ List<LinkSpec> specs = new ArrayList<>(OneDev.getInstance(LinkSpecManager.class).query());
+ Collections.sort(specs);
+
+ for (LinkSpec spec: specs) {
+ links.add(new LinkSide(spec, false));
+ if (spec.getOpposite() != null)
+ links.add(new LinkSide(spec, true));
+ }
+ return links;
+ }
+
+ }) {
+
+ @Override
+ protected void populateItem(ListItem<LinkSide> item) {
+ LinkSide side = item.getModelObject();
+
+ if (side.opposite && side.spec.getOpposite().isMultiple()
+ || !side.opposite && side.spec.isMultiple()) {
+ item.add(newMultipleLinks(item.getModel()));
+ } else {
+ item.add(newSingleLink(item.getModel()));
+ }
+ }
+
+ private Fragment newMultipleLinks(IModel<LinkSide> model) {
+ Fragment fragment = new Fragment("content", "multipleLinksFrag", IssueSidePanel.this);
+ LinkSide side = model.getObject();
+ LinkSpec spec = side.spec;
+ boolean opposite = side.opposite;
+
+ fragment.add(new Label("name", opposite?spec.getOpposite().getName():spec.getName()));
+
+ RepeatingView linkedIssuesView = new RepeatingView("linkedIssues");
+ for (Issue linkedIssue: getIssue().findLinkedIssues(spec, opposite)) {
+ LinkDeleteListener deleteListener = new LinkDeleteListener() {
+
+ @Override
+ void onDelete(AjaxRequestTarget target, Issue linkedIssue) {
+ getIssueChangeManager().removeLink(model.getObject().spec, getIssue(),
+ linkedIssue, opposite);
+ }
+
+ };
+ linkedIssuesView.add(newLinkedIssueContainer(linkedIssuesView.newChildId(),
+ linkedIssue, deleteListener));
+ }
+ fragment.add(linkedIssuesView);
+
+ IModel<Project> projectModel = new AbstractReadOnlyModel<Project>() {
+
+ @Override
+ public Project getObject() {
+ return getIssue().getProject();
+ }
+
+ };
+ fragment.add(new IssueAddChoice("add", new IssueChoiceProvider(projectModel)) {
+
+ @Override
+ protected void onSelect(AjaxRequestTarget target, Issue selection) {
+ LinkSpec spec = model.getObject().spec;
+ if (getIssue().equals(selection))
+ getSession().warn("Can not link to self");
+ else if (getIssue().findLinkedIssues(spec, opposite).contains(selection))
+ getSession().warn("Issue already added");
+ else
+ getIssueChangeManager().addLink(spec, getIssue(), selection, opposite);
+ }
+
+ }.setVisible(SecurityUtils.getUser() != null));
+
+ return fragment;
+ }
+
+ private Fragment newSingleLink(IModel<LinkSide> model) {
+ Fragment fragment = new Fragment("content", "singleLinkFrag", IssueSidePanel.this);
+
+ LinkSide side = model.getObject();
+ if (side.opposite)
+ fragment.add(new Label("name", side.spec.getOpposite().getName()));
+ else
+ fragment.add(new Label("name", side.spec.getName()));
+
+ SingleLinkBean bean = new SingleLinkBean();
+
+ Issue linkedIssue = getIssue().findLinkedIssue(side.spec, side.opposite);
+ if (linkedIssue != null)
+ bean.setIssueId(linkedIssue.getId());
+
+ Long linkedIssueId = bean.getIssueId();
+
+ fragment.add(new InplacePropertyEditLink("edit", new AlignPlacement(100, 0, 100, 0)) {
+
+ @Override
+ protected Serializable getBean() {
+ return bean;
+ }
+
+ @Override
+ protected String getPropertyName() {
+ return "issueId";
+ }
+
+ @Override
+ protected void onUpdated(IPartialPageRequestHandler handler, Serializable bean,
+ String propertyName) {
+ SingleLinkBean singleLinkBean = (SingleLinkBean) bean;
+ Issue linkedIssue = null;
+ if (singleLinkBean.getIssueId() != null)
+ linkedIssue = getIssueManager().load(singleLinkBean.getIssueId());
+ if (getIssue().equals(linkedIssue)) {
+ getSession().warn("Can not link to self");
+ singleLinkBean.setIssueId(linkedIssueId);
+ } else {
+ getIssueChangeManager().changeLink(model.getObject().spec, getIssue(),
+ linkedIssue, model.getObject().opposite);
+ }
+ }
+
+ }.setVisible(SecurityUtils.getUser() != null));
+
+ if (linkedIssue != null)
+ fragment.add(newLinkedIssueContainer("body", linkedIssue, null));
+ else
+ fragment.add(new Label("body", "<i>Not specified</i>").setEscapeModelStrings(false));
+
+ return fragment;
+ }
+
+ };
+ }
+
+ private Component newLinkedIssueContainer(String componentId, Issue linkedIssue,
+ @Nullable LinkDeleteListener deleteListener) {
+ Fragment fragment = new Fragment(componentId, "linkedIssueFrag", this);
+ Link<Void> link = new BookmarkablePageLink<Void>("number", IssueActivitiesPage.class,
+ IssueActivitiesPage.paramsOf(linkedIssue));
+ if (linkedIssue.getNumberScope().equals(getIssue().getNumberScope()))
+ link.add(new Label("label", "#" + linkedIssue.getNumber()));
+ else
+ link.add(new Label("label", linkedIssue.getFQN().toString()));
+ fragment.add(link);
+
+ Long issueId = linkedIssue.getId();
+ fragment.add(new AjaxLink<Void>("delete") {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmClickListener(
+ "Do you really want to remove this?"));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ Issue linkedIssue = getIssueManager().load(issueId);
+ deleteListener.onDelete(target, linkedIssue);
+ }
+
+ }.setVisible(deleteListener != null && SecurityUtils.getUser() != null));
+
+ fragment.add(new IssueStateBadge("state", new LoadableDetachableModel<Issue>() {
+
+ @Override
+ protected Issue load() {
+ return getIssueManager().load(issueId);
+ }
+
+ }));
+
+ link = new BookmarkablePageLink<Void>("title", IssueActivitiesPage.class,
+ IssueActivitiesPage.paramsOf(linkedIssue));
+ link.add(new Label("label", linkedIssue.getTitle()));
+ fragment.add(link);
+
+ return fragment;
+ }
+
private Component newMilestonesContainer() {
WebMarkupContainer container = new WebMarkupContainer("milestones") {
@@ -264,7 +464,7 @@ public abstract class IssueSidePanel extends Panel {
@Override
public void onClick(AjaxRequestTarget target) {
- getIssueChangeManager().removeFromMilestone(getIssue(), item.getModelObject());
+ getIssueChangeManager().removeSchedule(getIssue(), item.getModelObject());
}
@Override
@@ -323,7 +523,7 @@ public abstract class IssueSidePanel extends Panel {
@Override
protected void onSelect(AjaxRequestTarget target, Milestone milestone) {
- getIssueChangeManager().addToMilestone(getIssue(), milestone);
+ getIssueChangeManager().addSchedule(getIssue(), milestone);
}
});
@@ -468,6 +668,10 @@ public abstract class IssueSidePanel extends Panel {
return OneDev.getInstance(IssueChangeManager.class);
}
+ private IssueManager getIssueManager() {
+ return OneDev.getInstance(IssueManager.class);
+ }
+
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
@@ -477,5 +681,23 @@ public abstract class IssueSidePanel extends Panel {
protected abstract Issue getIssue();
protected abstract Component newDeleteLink(String componentId);
+
+ private static abstract class LinkDeleteListener implements Serializable {
+
+ abstract void onDelete(AjaxRequestTarget target, Issue linkedIssue);
+
+ }
+ private static class LinkSide {
+
+ final LinkSpec spec;
+
+ final boolean opposite;
+
+ LinkSide(LinkSpec spec, boolean opposite) {
+ this.spec = spec;
+ this.opposite = opposite;
+ }
+
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/side/SingleLinkBean.java b/server-core/src/main/java/io/onedev/server/web/component/issue/side/SingleLinkBean.java
new file mode 100644
index 0000000000..d5da382c64
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/side/SingleLinkBean.java
@@ -0,0 +1,24 @@
+package io.onedev.server.web.component.issue.side;
+
+import java.io.Serializable;
+
+import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.web.editable.annotation.IssueChoice;
+
+@Editable
+public class SingleLinkBean implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private Long issueId;
+
+ @IssueChoice
+ public Long getIssueId() {
+ return issueId;
+ }
+
+ public void setIssueId(Long issueId) {
+ this.issueId = issueId;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/side/issue-side.css b/server-core/src/main/java/io/onedev/server/web/component/issue/side/issue-side.css
index fa5752e946..c4241bb08a 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/side/issue-side.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/side/issue-side.css
@@ -32,9 +32,12 @@
.issue-side>.fields .field-values.editable:not(.with-working-indicator) .icon {
display: inline;
}
+.issue-side>.fields .field-values:hover .icon {
+ color: var(--primary);
+}
.issue-side>.fields .field-values.editable {
border-color: transparent;
}
-.issue-side>.milestones li+li {
- padding-top: 1.2rem;
+.issue-side>.milestones li+li, .issue-side>.links li+li {
+ margin-top: 1.2rem;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/choice/PullRequestChoiceProvider.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/choice/PullRequestChoiceProvider.java
index 1ee3e9361e..d45a1b8304 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/choice/PullRequestChoiceProvider.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/choice/PullRequestChoiceProvider.java
@@ -43,6 +43,8 @@ public class PullRequestChoiceProvider extends ChoiceProvider<PullRequest> {
.key("id").value(choice.getId())
.key("number").value(choice.getNumber())
.key("title").value(Emojis.getInstance().apply(HtmlEscape.escapeHtml5(choice.getTitle())));
+ if (!choice.getNumberScope().equals(projectModel.getObject().getForkRoot()))
+ writer.key("project").value(HtmlEscape.escapeHtml5(choice.getProject().getPath()));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/choice/pullrequest-choice.js b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/choice/pullrequest-choice.js
index 9be180e09a..7b040b9548 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/choice/pullrequest-choice.js
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/choice/pullrequest-choice.js
@@ -1,12 +1,16 @@
onedev.server.pullRequestChoiceFormatter = {
+ formatPullRequest: function(request) {
+ if (request.project)
+ return request.project + "#" + request.number + " " + request.title;
+ else
+ return "#" + request.number + " " + request.title;
+ },
formatSelection: function(request) {
- return "#" + request.number + " " + request.title;
+ return onedev.server.pullRequestChoiceFormatter.formatPullRequest(request);
},
-
formatResult: function(request) {
- return "<div class='pull-request'>#" + request.number + " " + request.title + "</div>";
+ return onedev.server.pullRequestChoiceFormatter.formatPullRequest(request);
},
-
escapeMarkup: function(m) {
return m;
},
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/InplacePropertyEditLink.java b/server-core/src/main/java/io/onedev/server/web/editable/InplacePropertyEditLink.java
index 262f8bd4c7..2f0ec01919 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/InplacePropertyEditLink.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/InplacePropertyEditLink.java
@@ -17,6 +17,10 @@ public abstract class InplacePropertyEditLink extends DropdownLink {
super(id, new AlignPlacement(0, 0, 0, 0));
}
+ public InplacePropertyEditLink(String id, AlignPlacement placement) {
+ super(id, placement);
+ }
+
@Override
protected void onInitialize(FloatingPanel dropdown) {
super.onInitialize(dropdown);
@@ -25,7 +29,7 @@ public abstract class InplacePropertyEditLink extends DropdownLink {
@Override
protected Component newContent(String id, FloatingPanel dropdown) {
- return new InplacePropertyEditPanel<Serializable>(id, getBean(), getPropertyName()) {
+ return new InplacePropertyEditPanel(id, getBean(), getPropertyName()) {
@Override
protected void onUpdated(IPartialPageRequestHandler handler, Serializable bean, String propertyName) {
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/InplacePropertyEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/InplacePropertyEditPanel.java
index 5fe68cad09..44b486b4b4 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/InplacePropertyEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/InplacePropertyEditPanel.java
@@ -15,7 +15,7 @@ import org.apache.wicket.markup.html.panel.Panel;
import io.onedev.server.util.EditContext;
@SuppressWarnings("serial")
-public abstract class InplacePropertyEditPanel<T> extends Panel implements EditContext {
+public abstract class InplacePropertyEditPanel extends Panel implements EditContext {
private final Serializable bean;
@@ -101,7 +101,7 @@ public abstract class InplacePropertyEditPanel<T> extends Panel implements EditC
}
- protected abstract void onUpdated(IPartialPageRequestHandler handler, Serializable bean, String z);
+ protected abstract void onUpdated(IPartialPageRequestHandler handler, Serializable bean, String propertyName);
protected abstract void onCancelled(IPartialPageRequestHandler handler);
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildChoiceEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildChoiceEditSupport.java
index 131337b170..1e4ba506a2 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildChoiceEditSupport.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildChoiceEditSupport.java
@@ -1,13 +1,19 @@
package io.onedev.server.web.editable.build.choice;
import java.lang.reflect.Method;
+import java.util.ArrayList;
import java.util.List;
-import java.util.stream.Collectors;
import org.apache.wicket.Component;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
+import org.unbescape.html.HtmlEscape;
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.BuildManager;
+import io.onedev.server.model.Build;
+import io.onedev.server.model.Project;
import io.onedev.server.util.ReflectionUtils;
import io.onedev.server.web.editable.EditSupport;
import io.onedev.server.web.editable.EmptyValueLabel;
@@ -37,7 +43,15 @@ public class BuildChoiceEditSupport implements EditSupport {
protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {
List<Long> buildIds = model.getObject();
if (buildIds != null && !buildIds.isEmpty()) {
- return new Label(id, buildIds.stream().map(it->"#"+it).collect(Collectors.joining(", ")));
+ List<String> buildNumbers = new ArrayList<>();
+ for (Long buildId: buildIds) {
+ Build build = getBuildManager().get(buildId);
+ if (build != null)
+ buildNumbers.add(HtmlEscape.escapeHtml5(getBuildNumber(build)));
+ else
+ buildNumbers.add("<i>Not Found</i>");
+ }
+ return new Label(id, StringUtils.join(buildNumbers, ", ")).setEscapeModelStrings(false);
} else {
return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());
}
@@ -61,10 +75,16 @@ public class BuildChoiceEditSupport implements EditSupport {
@Override
protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {
- if (model.getObject() != null)
- return new Label(id, "#" + model.getObject());
- else
+ Long buildId = model.getObject();
+ if (buildId != null) {
+ Build build = getBuildManager().get(buildId);
+ if (build != null)
+ return new Label(id, getBuildNumber(build));
+ else
+ return new Label(id, "<i>Not Found</i>").setEscapeModelStrings(false);
+ } else {
return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());
+ }
}
};
@@ -83,6 +103,17 @@ public class BuildChoiceEditSupport implements EditSupport {
return null;
}
}
+
+ private String getBuildNumber(Build build) {
+ if (Project.get() != null && Project.get().getForkRoot().equals(build.getNumberScope()))
+ return "#" + build.getNumber();
+ else
+ return build.getFQN().toString();
+ }
+
+ private BuildManager getBuildManager() {
+ return OneDev.getInstance(BuildManager.class);
+ }
@Override
public int getPriority() {
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildMultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildMultiChoiceEditor.java
index 8e02e945d7..0087de1ef2 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildMultiChoiceEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildMultiChoiceEditor.java
@@ -47,8 +47,8 @@ public class BuildMultiChoiceEditor extends PropertyEditor<List<Long>> {
List<Build> selections = new ArrayList<>();
if (getModelObject() != null) {
BuildManager buildManager = OneDev.getInstance(BuildManager.class);
- for (Long buildNumber: getModelObject()) {
- Build build = buildManager.find(getProject(), buildNumber);
+ for (Long buildId: getModelObject()) {
+ Build build = buildManager.get(buildId);
if (build != null)
selections.add(build);
}
@@ -91,7 +91,7 @@ public class BuildMultiChoiceEditor extends PropertyEditor<List<Long>> {
protected List<Long> convertInputToValue() throws ConversionException {
Collection<Build> builds = input.getConvertedInput();
if (builds != null)
- return builds.stream().map(it->it.getNumber()).collect(Collectors.toList());
+ return builds.stream().map(it->it.getId()).collect(Collectors.toList());
else
return new ArrayList<>();
}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildSingleChoiceEditor.java
index 9aa31a006a..2392e71db6 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildSingleChoiceEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildSingleChoiceEditor.java
@@ -41,7 +41,7 @@ public class BuildSingleChoiceEditor extends PropertyEditor<Long> {
Build build;
if (getModelObject() != null)
- build = OneDev.getInstance(BuildManager.class).find(getProject(), getModelObject());
+ build = OneDev.getInstance(BuildManager.class).get(getModelObject());
else
build = null;
@@ -82,7 +82,7 @@ public class BuildSingleChoiceEditor extends PropertyEditor<Long> {
protected Long convertInputToValue() throws ConversionException {
Build build = input.getConvertedInput();
if (build != null)
- return build.getNumber();
+ return build.getId();
else
return null;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueChoiceEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueChoiceEditSupport.java
index 0b832f0c33..bf9aa53264 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueChoiceEditSupport.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueChoiceEditSupport.java
@@ -6,6 +6,10 @@ import org.apache.wicket.Component;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.IssueManager;
+import io.onedev.server.model.Issue;
+import io.onedev.server.model.Project;
import io.onedev.server.web.editable.EditSupport;
import io.onedev.server.web.editable.EmptyValueLabel;
import io.onedev.server.web.editable.PropertyContext;
@@ -31,10 +35,20 @@ public class IssueChoiceEditSupport implements EditSupport {
@Override
protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {
- if (model.getObject() != null)
- return new Label(id, "#" + model.getObject());
- else
+ Long issueId = model.getObject();
+ if (issueId != null) {
+ Issue issue = OneDev.getInstance(IssueManager.class).get(issueId);
+ if (issue != null) {
+ if (Project.get() != null && Project.get().getForkRoot().equals(issue.getNumberScope()))
+ return new Label(id, "#" + issue.getNumber());
+ else
+ return new Label(id, issue.getFQN().toString());
+ } else {
+ return new Label(id, "<i>Not Found</i>").setEscapeModelStrings(false);
+ }
+ } else {
return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());
+ }
}
};
@@ -42,7 +56,7 @@ public class IssueChoiceEditSupport implements EditSupport {
@Override
public PropertyEditor<Long> renderForEdit(String componentId, IModel<Long> model) {
- return new IssueSingleChoiceEditor(componentId, descriptor, model);
+ return new IssueChoiceEditor(componentId, descriptor, model);
}
};
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueSingleChoiceEditor.html b/server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueChoiceEditor.html
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueSingleChoiceEditor.html
rename to server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueChoiceEditor.html
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueChoiceEditor.java
similarity index 82%
rename from server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueSingleChoiceEditor.java
rename to server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueChoiceEditor.java
index e0f85dbab5..4e873dae2e 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueSingleChoiceEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueChoiceEditor.java
@@ -12,17 +12,17 @@ import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.web.component.issue.choice.IssueChoiceProvider;
-import io.onedev.server.web.component.issue.choice.IssueSingleChoice;
+import io.onedev.server.web.component.issue.choice.IssueChoice;
import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.PropertyEditor;
import io.onedev.server.web.util.ProjectAware;
@SuppressWarnings("serial")
-public class IssueSingleChoiceEditor extends PropertyEditor<Long> {
+public class IssueChoiceEditor extends PropertyEditor<Long> {
- private IssueSingleChoice input;
+ private IssueChoice input;
- public IssueSingleChoiceEditor(String id, PropertyDescriptor propertyDescriptor,
+ public IssueChoiceEditor(String id, PropertyDescriptor propertyDescriptor,
IModel<Long> propertyModel) {
super(id, propertyDescriptor, propertyModel);
}
@@ -41,7 +41,7 @@ public class IssueSingleChoiceEditor extends PropertyEditor<Long> {
Issue issue;
if (getModelObject() != null)
- issue = OneDev.getInstance(IssueManager.class).find(getProject(), getModelObject());
+ issue = OneDev.getInstance(IssueManager.class).get(getModelObject());
else
issue = null;
@@ -53,7 +53,7 @@ public class IssueSingleChoiceEditor extends PropertyEditor<Long> {
}
});
- input = new IssueSingleChoice("input", Model.of(issue), choiceProvider) {
+ input = new IssueChoice("input", Model.of(issue), choiceProvider) {
@Override
protected void onInitialize() {
@@ -82,7 +82,7 @@ public class IssueSingleChoiceEditor extends PropertyEditor<Long> {
protected Long convertInputToValue() throws ConversionException {
Issue issue = input.getConvertedInput();
if (issue != null)
- return issue.getNumber();
+ return issue.getId();
else
return null;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/choice/PullRequestChoiceEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/choice/PullRequestChoiceEditSupport.java
index 87d8b923b6..f291a6f4fc 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/choice/PullRequestChoiceEditSupport.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/choice/PullRequestChoiceEditSupport.java
@@ -6,6 +6,10 @@ import org.apache.wicket.Component;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
+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.editable.EditSupport;
import io.onedev.server.web.editable.EmptyValueLabel;
import io.onedev.server.web.editable.PropertyContext;
@@ -31,11 +35,20 @@ public class PullRequestChoiceEditSupport implements EditSupport {
@Override
protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {
- if (model.getObject() != null) {
- return new Label(id, "#" + model.getObject());
- } else {
+ Long pullRequestId = model.getObject();
+ if (pullRequestId != null) {
+ PullRequest request = OneDev.getInstance(PullRequestManager.class).get(pullRequestId);
+ if (request != null) {
+ if (Project.get() != null && Project.get().getForkRoot().equals(request.getNumberScope()))
+ return new Label(id, "#" + request.getNumber());
+ else
+ return new Label(id, request.getFQN().toString());
+ } else {
+ return new Label(id, "<i>Not Found</i>").setEscapeModelStrings(false);
+ }
+ } else {
return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());
- }
+ }
}
};
@@ -43,7 +56,7 @@ public class PullRequestChoiceEditSupport implements EditSupport {
@Override
public PropertyEditor<Long> renderForEdit(String componentId, IModel<Long> model) {
- return new PullRequestSingleChoiceEditor(componentId, descriptor, model);
+ return new PullRequestChoiceEditor(componentId, descriptor, model);
}
};
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/choice/PullRequestSingleChoiceEditor.html b/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/choice/PullRequestChoiceEditor.html
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/editable/pullrequest/choice/PullRequestSingleChoiceEditor.html
rename to server-core/src/main/java/io/onedev/server/web/editable/pullrequest/choice/PullRequestChoiceEditor.html
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/choice/PullRequestSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/choice/PullRequestChoiceEditor.java
similarity index 89%
rename from server-core/src/main/java/io/onedev/server/web/editable/pullrequest/choice/PullRequestSingleChoiceEditor.java
rename to server-core/src/main/java/io/onedev/server/web/editable/pullrequest/choice/PullRequestChoiceEditor.java
index cdafa5f9d7..6b0c39553e 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/choice/PullRequestSingleChoiceEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/pullrequest/choice/PullRequestChoiceEditor.java
@@ -18,11 +18,11 @@ import io.onedev.server.web.editable.PropertyEditor;
import io.onedev.server.web.util.ProjectAware;
@SuppressWarnings("serial")
-public class PullRequestSingleChoiceEditor extends PropertyEditor<Long> {
+public class PullRequestChoiceEditor extends PropertyEditor<Long> {
private PullRequestSingleChoice input;
- public PullRequestSingleChoiceEditor(String id, PropertyDescriptor propertyDescriptor,
+ public PullRequestChoiceEditor(String id, PropertyDescriptor propertyDescriptor,
IModel<Long> propertyModel) {
super(id, propertyDescriptor, propertyModel);
}
@@ -41,7 +41,7 @@ public class PullRequestSingleChoiceEditor extends PropertyEditor<Long> {
PullRequest request;
if (getModelObject() != null)
- request = OneDev.getInstance(PullRequestManager.class).find(getProject(), getModelObject());
+ request = OneDev.getInstance(PullRequestManager.class).get(getModelObject());
else
request = null;
@@ -82,7 +82,7 @@ public class PullRequestSingleChoiceEditor extends PropertyEditor<Long> {
protected Long convertInputToValue() throws ConversionException {
PullRequest request = input.getConvertedInput();
if (request != null)
- return request.getNumber();
+ return request.getId();
else
return null;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/linkspec/LinkSpecEditPanel.html b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/linkspec/LinkSpecEditPanel.html
new file mode 100644
index 0000000000..7267a64d2e
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/linkspec/LinkSpecEditPanel.html
@@ -0,0 +1,15 @@
+<wicket:panel>
+ <form wicket:id="form" class="link-spec-edit leave-confirm">
+ <div class="modal-header">
+ <h5 id="modal-title" class="modal-title">Issue Link</h5>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
+ </div>
+ <div class="modal-body">
+ <div wicket:id="editor"></div>
+ </div>
+ <div class="modal-footer">
+ <input wicket:id="save" type="submit" class="dirty-aware btn btn-primary" value="Save">
+ <a wicket:id="cancel" class="btn btn-secondary">Cancel</a>
+ </div>
+ </form>
+</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/linkspec/LinkSpecEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/linkspec/LinkSpecEditPanel.java
new file mode 100644
index 0000000000..1895591f63
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/linkspec/LinkSpecEditPanel.java
@@ -0,0 +1,128 @@
+package io.onedev.server.web.page.admin.issuesetting.linkspec;
+
+import java.io.Serializable;
+
+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.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.panel.GenericPanel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.request.cycle.RequestCycle;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.LinkSpecManager;
+import io.onedev.server.model.LinkSpec;
+import io.onedev.server.util.Path;
+import io.onedev.server.util.PathNode;
+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
+import io.onedev.server.web.editable.BeanContext;
+import io.onedev.server.web.editable.BeanEditor;
+
+@SuppressWarnings("serial")
+abstract class LinkSpecEditPanel extends GenericPanel<LinkSpec> {
+
+ private BeanEditor editor;
+
+ public LinkSpecEditPanel(String id, IModel<LinkSpec> model) {
+ super(id, model);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ Form<?> form = new Form<Void>("form") {
+
+ @Override
+ protected void onError() {
+ super.onError();
+ RequestCycle.get().find(AjaxRequestTarget.class).add(this);
+ }
+
+ };
+
+ form.add(new AjaxLink<Void>("close") {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(LinkSpecEditPanel.this));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onCancel(target);
+ }
+
+ });
+
+ editor = BeanContext.editModel("editor", new IModel<Serializable>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public Serializable getObject() {
+ return getSpec();
+ }
+
+ @Override
+ public void setObject(Serializable object) {
+ editor.getDescriptor().copyProperties(object, getSpec());
+ }
+
+ });
+
+ form.add(editor);
+
+ form.add(new AjaxButton("save") {
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+ super.onSubmit(target, form);
+
+ LinkSpecManager manager = OneDev.getInstance(LinkSpecManager.class);
+ LinkSpec specWithSameName = manager.find(getSpec().getName());
+ if (getSpec().isNew() && specWithSameName != null
+ || !getSpec().isNew() && specWithSameName != null && !specWithSameName.equals(getSpec())) {
+ editor.error(new Path(new PathNode.Named("name")), "Name already used by another link");
+ target.add(form);
+ } else {
+ manager.save(getSpec());
+ onSave(target);
+ }
+ }
+
+ });
+
+ form.add(new AjaxLink<Void>("cancel") {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(LinkSpecEditPanel.this));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onCancel(target);
+ }
+
+ });
+ form.setOutputMarkupId(true);
+
+ add(form);
+ }
+
+ private LinkSpec getSpec() {
+ return getModelObject();
+ }
+
+ protected abstract void onSave(AjaxRequestTarget target);
+
+ protected abstract void onCancel(AjaxRequestTarget target);
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/linkspec/LinkSpecListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/linkspec/LinkSpecListPage.html
new file mode 100644
index 0000000000..bdde8d2a0c
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/linkspec/LinkSpecListPage.html
@@ -0,0 +1,14 @@
+<wicket:extend>
+ <div class="issue-links">
+ <div class="text-muted mb-4">
+ <wicket:svg href="bulb" class="icon"/> Links can be used to associate different issues. For instance, an issue can be linked to
+ child issues or blocking issues
+ </div>
+ <a wicket:id="addNew" class="btn btn-icon btn-primary mb-4" title="Add issue link"><wicket:svg href="plus" class="icon"></wicket:svg></a>
+ <table wicket:id="links" class="table table-hover"></table>
+ </div>
+ <wicket:fragment wicket:id="linkActionsFrag">
+ <a wicket:id="edit" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-1" title="More"><wicket:svg href="ellipsis" class="icon align-middle"></wicket:svg></a>
+ <a wicket:id="delete" class="btn btn-xs btn-icon btn-light btn-hover-danger" title="Delete this link"><wicket:svg href="trash" class="icon align-middle"></wicket:svg></a>
+ </wicket:fragment>
+</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/linkspec/LinkSpecListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/linkspec/LinkSpecListPage.java
new file mode 100644
index 0000000000..15223fcf31
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/linkspec/LinkSpecListPage.java
@@ -0,0 +1,181 @@
+package io.onedev.server.web.page.admin.issuesetting.linkspec;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.wicket.Component;
+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.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.HeadersToolbar;
+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.markup.html.basic.Label;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.markup.repeater.Item;
+import org.apache.wicket.markup.repeater.data.IDataProvider;
+import org.apache.wicket.markup.repeater.data.ListDataProvider;
+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 edu.emory.mathcs.backport.java.util.Collections;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.LinkSpecManager;
+import io.onedev.server.model.LinkSpec;
+import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
+import io.onedev.server.web.behavior.NoRecordsBehavior;
+import io.onedev.server.web.component.modal.ModalLink;
+import io.onedev.server.web.component.modal.ModalPanel;
+import io.onedev.server.web.page.admin.issuesetting.IssueSettingPage;
+
+@SuppressWarnings("serial")
+public class LinkSpecListPage extends IssueSettingPage {
+
+ public LinkSpecListPage(PageParameters params) {
+ super(params);
+ }
+
+ private DataTable<LinkSpec, Void> linksTable;
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(new ModalLink("addNew") {
+
+ @Override
+ protected Component newContent(String id, ModalPanel modal) {
+ return new LinkSpecEditPanel(id, Model.of(new LinkSpec())) {
+
+ @Override
+ protected void onSave(AjaxRequestTarget target) {
+ target.add(linksTable);
+ modal.close();
+ }
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ modal.close();
+ }
+
+ };
+ }
+
+ });
+
+ List<IColumn<LinkSpec, Void>> columns = new ArrayList<>();
+
+ columns.add(new AbstractColumn<LinkSpec, Void>(Model.of("Name")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<LinkSpec>> cellItem, String componentId, IModel<LinkSpec> rowModel) {
+ LinkSpec link = rowModel.getObject();
+ cellItem.add(new Label(componentId, link.getName()));
+ }
+ });
+
+ columns.add(new AbstractColumn<LinkSpec, Void>(Model.of("Name On the Other Side")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<LinkSpec>> cellItem, String componentId, IModel<LinkSpec> rowModel) {
+ LinkSpec link = rowModel.getObject();
+ if (link.getOpposite() != null)
+ cellItem.add(new Label(componentId, link.getOpposite().getName()));
+ else
+ cellItem.add(new Label(componentId, link.getName()));
+ }
+
+ });
+
+ columns.add(new AbstractColumn<LinkSpec, Void>(Model.of("")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<LinkSpec>> cellItem, String componentId, IModel<LinkSpec> rowModel) {
+ Fragment fragment = new Fragment(componentId, "linkActionsFrag", LinkSpecListPage.this);
+ fragment.add(new ModalLink("edit") {
+
+ @Override
+ protected Component newContent(String id, ModalPanel modal) {
+ return new LinkSpecEditPanel(id, rowModel) {
+
+ @Override
+ protected void onSave(AjaxRequestTarget target) {
+ target.add(linksTable);
+ modal.close();
+ }
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ modal.close();
+ }
+
+ };
+ }
+
+ });
+ fragment.add(new AjaxLink<Void>("delete") {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to delete this link?"));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ getLinkSpecManager().delete(rowModel.getObject());
+ target.add(linksTable);
+ }
+
+ });
+ cellItem.add(fragment);
+ }
+
+ });
+
+ IDataProvider<LinkSpec> dataProvider = new ListDataProvider<LinkSpec>() {
+
+ @Override
+ protected List<LinkSpec> getData() {
+ List<LinkSpec> links = getLinkSpecManager().query();
+ Collections.sort(links);
+ return links;
+ }
+
+ @Override
+ public IModel<LinkSpec> model(LinkSpec object) {
+ Long id = object.getId();
+ return new LoadableDetachableModel<LinkSpec>() {
+
+ @Override
+ protected LinkSpec load() {
+ return getLinkSpecManager().load(id);
+ }
+
+ };
+ }
+
+ };
+
+ add(linksTable = new DataTable<LinkSpec, Void>("links", columns, dataProvider, Integer.MAX_VALUE));
+ linksTable.addTopToolbar(new HeadersToolbar<Void>(linksTable, null));
+ linksTable.addBottomToolbar(new NoRecordsToolbar(linksTable));
+ linksTable.add(new NoRecordsBehavior());
+ linksTable.setOutputMarkupId(true);
+ }
+
+ private LinkSpecManager getLinkSpecManager() {
+ return OneDev.getInstance(LinkSpecManager.class);
+ }
+
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ return new Label(componentId, "Issue Links");
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
index 7d7ba9be77..e769558994 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
@@ -57,6 +57,7 @@ import io.onedev.server.web.page.admin.group.create.NewGroupPage;
import io.onedev.server.web.page.admin.issuesetting.defaultboard.DefaultBoardListPage;
import io.onedev.server.web.page.admin.issuesetting.fieldspec.IssueFieldListPage;
import io.onedev.server.web.page.admin.issuesetting.issuetemplate.IssueTemplateListPage;
+import io.onedev.server.web.page.admin.issuesetting.linkspec.LinkSpecListPage;
import io.onedev.server.web.page.admin.issuesetting.statespec.IssueStateListPage;
import io.onedev.server.web.page.admin.issuesetting.transitionspec.StateTransitionListPage;
import io.onedev.server.web.page.admin.mailsetting.MailSettingPage;
@@ -149,6 +150,8 @@ public abstract class LayoutPage extends BasePage {
StateTransitionListPage.class, new PageParameters()));
issueSettingMenuItems.add(new SidebarMenuItem.Page(null, "Default Boards",
DefaultBoardListPage.class, new PageParameters()));
+ issueSettingMenuItems.add(new SidebarMenuItem.Page(null, "Links",
+ LinkSpecListPage.class, new PageParameters()));
issueSettingMenuItems.add(new SidebarMenuItem.Page(null, "Description Templates",
IssueTemplateListPage.class, new PageParameters()));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java
index 7f826a31eb..573c682272 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java
@@ -153,7 +153,7 @@ abstract class BacklogColumnPanel extends Panel {
Issue issue = OneDev.getInstance(IssueManager.class).load(params.getParameterValue("issue").toLong());
if (!SecurityUtils.canScheduleIssues(issue.getProject()))
throw new UnauthorizedException("Permission denied");
- OneDev.getInstance(IssueChangeManager.class).removeFromMilestone(issue, getMilestone());
+ OneDev.getInstance(IssueChangeManager.class).removeSchedule(issue, getMilestone());
target.appendJavaScript(String.format("onedev.server.issueBoards.markAccepted(%d, true);", issue.getId()));
}
@@ -174,7 +174,7 @@ abstract class BacklogColumnPanel extends Panel {
Issue issue = issueDragging.getIssue();
if (SecurityUtils.canScheduleIssues(issue.getProject())) {
issue = SerializationUtils.clone(issue);
- issue.removeFromMilestone(getMilestone());
+ issue.removeSchedule(getMilestone());
}
if (getQuery().matches(issue)) {
String script = String.format("$('#%s').addClass('issue-droppable');", getMarkupId());
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java
index ec9d5405ef..7edd6b9c96 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java
@@ -241,13 +241,10 @@ abstract class BoardCardPanel extends GenericPanel<Issue> {
@Override
public IModel<?> getBody() {
- String prefix;
if (getProject().equals(getIssue().getProject()))
- prefix = "";
+ return Model.of("#" + getIssue().getNumber());
else
- prefix = getIssue().getProject().getPath().substring(getProject().getPath().length()+1);
-
- return Model.of(prefix + "#" + getIssue().getNumber());
+ return Model.of(getIssue().getProject() + "#" + getIssue().getNumber());
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java
index df3704b619..f978bf4653 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java
@@ -353,7 +353,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {
if (!SecurityUtils.canScheduleIssues(issue.getProject()))
throw new UnauthorizedException("Permission denied");
- OneDev.getInstance(IssueChangeManager.class).addToMilestone(issue, getMilestone());
+ OneDev.getInstance(IssueChangeManager.class).addSchedule(issue, getMilestone());
markAccepted(target, issue, true);
} else if (fieldName.equals(Issue.NAME_STATE)) {
AtomicReference<TransitionSpec> transitionRef = new AtomicReference<>(null);