Skip to content

The Unified and Autonomous Development Platform

Improvements and bugs related to issue link

Robin Shen24d377b15948
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
index 2d4d062d95..f0696e90b7 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/IssueLinkManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/IssueLinkManager.java
@@ -13,4 +13,6 @@ public interface IssueLinkManager extends EntityManager<IssueLink> {
void populateLinks(Collection<Issue> issues);
+ void loadDeepLinks(Issue issue);
+
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.java
index 38c96e4e3c..8e27a808fe 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.java
@@ -43,7 +43,7 @@ public interface IssueManager extends EntityManager<Issue> {
int count(@Nullable Criteria<Issue> issueCriteria);
List<Issue> query(Project project, boolean inTree, EntityQuery<Issue> issueQuery,
- int firstResult, int maxResults, boolean loadFields);
+ int firstResult, int maxResults, boolean loadFieldsAndLinks);
int count(Project project, boolean inTree, @Nullable Criteria<Issue> issueCriteria);
@@ -81,5 +81,5 @@ public interface IssueManager extends EntityManager<Issue> {
void clearSchedules(Project project, Collection<Milestone> milestones);
List<Issue> queryAfter(@Nullable Long afterIssueId, int count);
-
+
}
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
index 71dae4d37c..6cfedba6ff 100644
--- 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
@@ -2,6 +2,9 @@ package io.onedev.server.entitymanager.impl;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import javax.inject.Inject;
import javax.inject.Singleton;
@@ -9,6 +12,10 @@ import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Root;
+import org.hibernate.Hibernate;
+import org.hibernate.query.Query;
+
+import io.onedev.server.entitymanager.IssueFieldManager;
import io.onedev.server.entitymanager.IssueLinkManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueLink;
@@ -21,9 +28,12 @@ import io.onedev.server.persistence.dao.Dao;
@Singleton
public class DefaultIssueLinkManager extends BaseEntityManager<IssueLink> implements IssueLinkManager {
+ private final IssueFieldManager fieldManager;
+
@Inject
- public DefaultIssueLinkManager(Dao dao) {
+ public DefaultIssueLinkManager(Dao dao, IssueFieldManager fieldManager) {
super(dao);
+ this.fieldManager = fieldManager;
}
@Transactional
@@ -84,26 +94,73 @@ public class DefaultIssueLinkManager extends BaseEntityManager<IssueLink> implem
@Override
public void populateLinks(Collection<Issue> issues) {
CriteriaBuilder builder = getSession().getCriteriaBuilder();
- CriteriaQuery<IssueLink> query = builder.createQuery(IssueLink.class);
+ CriteriaQuery<IssueLink> linkQuery = builder.createQuery(IssueLink.class);
- Root<IssueLink> root = query.from(IssueLink.class);
- query.select(root);
+ Root<IssueLink> linkRoot = linkQuery.from(IssueLink.class);
+ linkQuery.select(linkRoot);
- query.where(builder.or(
- root.get(IssueLink.PROP_SOURCE).in(issues)),
- root.get(IssueLink.PROP_TARGET).in(issues));
+ linkQuery.where(builder.or(
+ linkRoot.get(IssueLink.PROP_SOURCE).in(issues),
+ linkRoot.get(IssueLink.PROP_TARGET).in(issues)));
for (Issue issue: issues) {
issue.setSourceLinks(new ArrayList<>());
issue.setTargetLinks(new ArrayList<>());
}
+
+ for (IssueLink link: getSession().createQuery(linkQuery).getResultList()) {
+ issues.stream().filter(it->it.equals(link.getSource())).forEach(it->it.getTargetLinks().add(link));
+ issues.stream().filter(it->it.equals(link.getTarget())).forEach(it->it.getSourceLinks().add(link));
+ }
+ }
+
+ @Sessional
+ @Override
+ public void loadDeepLinks(Issue issue) {
+ CriteriaBuilder builder = getSession().getCriteriaBuilder();
+ CriteriaQuery<Object[]> criteriaQuery = builder.createQuery(Object[].class);
+ Root<IssueLink> root = criteriaQuery.from(IssueLink.class);
+ criteriaQuery.multiselect(root, root.get(IssueLink.PROP_SOURCE), root.get(IssueLink.PROP_TARGET));
+
+ criteriaQuery.where(builder.or(
+ builder.equal(root.get(IssueLink.PROP_SOURCE), issue),
+ builder.equal(root.get(IssueLink.PROP_TARGET), issue)));
+
+ Query<Object[]> query = getSession().createQuery(criteriaQuery);
+ query.setFirstResult(0);
+ query.setMaxResults(Integer.MAX_VALUE);
+
+ List<IssueLink> sourceLinks = new ArrayList<>();
+ List<IssueLink> targetLinks = new ArrayList<>();
- for (IssueLink link: getSession().createQuery(query).getResultList()) {
- Long sourceId = Issue.idOf(link.getSource());
- Long targetId = Issue.idOf(link.getTarget());
- issues.stream().filter(it->it.getId().equals(sourceId)).forEach(it->it.getTargetLinks().add(link));
- issues.stream().filter(it->it.getId().equals(targetId)).forEach(it->it.getSourceLinks().add(link));
+ List<Object[]> results = query.getResultList();
+ if (!results.isEmpty()) {
+ Map<Long, Issue> issues = new HashMap<>();
+ for (Object[] row: results) {
+ IssueLink link = (IssueLink) row[0];
+ Issue source = (Issue) row[1];
+ Issue target = (Issue) row[2];
+ if (!source.equals(issue))
+ sourceLinks.add(link);
+ issues.put(source.getId(), source);
+ if (!target.equals(issue))
+ targetLinks.add(link);
+ issues.put(target.getId(), target);
+ }
+
+ if (Hibernate.isInitialized(issue.getFields())) {
+ issues.remove(issue.getId());
+ fieldManager.populateFields(issues.values());
+ populateLinks(issues.values());
+ } else {
+ fieldManager.populateFields(issues.values());
+ issues.remove(issue.getId());
+ populateLinks(issues.values());
+ }
}
+
+ issue.setSourceLinks(sourceLinks);
+ issue.setTargetLinks(targetLinks);
}
}
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 dae010319b..8c047bc78e 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
@@ -40,7 +40,6 @@ 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.LinkSpecManager;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.entitymanager.RoleManager;
@@ -99,15 +98,15 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
private static final Logger logger = LoggerFactory.getLogger(DefaultIssueManager.class);
- private final IssueFieldManager issueFieldManager;
+ private final IssueFieldManager fieldManager;
private final ListenerRegistry listenerRegistry;
- private final IssueQueryPersonalizationManager issueQueryPersonalizationManager;
+ private final IssueQueryPersonalizationManager queryPersonalizationManager;
private final AttachmentStorageManager attachmentStorageManager;
- private final IssueCommentManager issueCommentManager;
+ private final IssueCommentManager commentManager;
private final SettingManager settingManager;
@@ -123,24 +122,23 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
private final LinkSpecManager linkSpecManager;
- private final IssueLinkManager issueLinkManager;
+ private final IssueLinkManager linkManager;
private final Map<Long, IssueFacade> cache = new HashMap<>();
private final ReadWriteLock cacheLock = new ReentrantReadWriteLock();
@Inject
- public DefaultIssueManager(Dao dao, IssueFieldManager issueFieldManager,
- TransactionManager transactionManager, IssueQueryPersonalizationManager issueQueryPersonalizationManager,
+ public DefaultIssueManager(Dao dao, IssueFieldManager fieldManager,
+ TransactionManager transactionManager, IssueQueryPersonalizationManager queryPersonalizationManager,
SettingManager settingManager, ListenerRegistry listenerRegistry,
ProjectManager projectManager, UserManager userManager,
RoleManager roleManager, AttachmentStorageManager attachmentStorageManager,
- IssueCommentManager issueCommentManager, EntityReferenceManager entityReferenceManager,
- IssueScheduleManager issueScheduleManager, LinkSpecManager linkSpecManager,
- IssueLinkManager issueLinkManager) {
+ IssueCommentManager commentManager, EntityReferenceManager entityReferenceManager,
+ LinkSpecManager linkSpecManager, IssueLinkManager linkManager) {
super(dao);
- this.issueFieldManager = issueFieldManager;
- this.issueQueryPersonalizationManager = issueQueryPersonalizationManager;
+ this.fieldManager = fieldManager;
+ this.queryPersonalizationManager = queryPersonalizationManager;
this.listenerRegistry = listenerRegistry;
this.settingManager = settingManager;
this.projectManager = projectManager;
@@ -148,9 +146,9 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
this.userManager = userManager;
this.roleManager = roleManager;
this.linkSpecManager = linkSpecManager;
- this.issueLinkManager = issueLinkManager;
+ this.linkManager = linkManager;
this.attachmentStorageManager = attachmentStorageManager;
- this.issueCommentManager = issueCommentManager;
+ this.commentManager = commentManager;
this.entityReferenceManager = entityReferenceManager;
}
@@ -209,7 +207,7 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
save(issue);
- issueFieldManager.saveFields(issue);
+ fieldManager.saveFields(issue);
for (IssueSchedule schedule: issue.getSchedules())
dao.persist(schedule);
@@ -289,8 +287,8 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
query.setMaxResults(maxResults);
List<Issue> issues = query.getResultList();
if (loadFieldsAndLinks && !issues.isEmpty()) {
- issueFieldManager.populateFields(issues);
- issueLinkManager.populateLinks(issues);
+ fieldManager.populateFields(issues);
+ linkManager.populateLinks(issues);
}
return issues;
@@ -299,7 +297,7 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
@Sessional
@Override
public List<Issue> query(Project project, boolean inTree, EntityQuery<Issue> issueQuery,
- int firstResult, int maxResults, boolean loadFields) {
+ int firstResult, int maxResults, boolean loadFieldsAndLinks) {
CriteriaBuilder builder = getSession().getCriteriaBuilder();
CriteriaQuery<Issue> criteriaQuery = builder.createQuery(Issue.class);
Root<Issue> root = criteriaQuery.from(Issue.class);
@@ -311,8 +309,10 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
query.setFirstResult(firstResult);
query.setMaxResults(maxResults);
List<Issue> issues = query.getResultList();
- if (loadFields && !issues.isEmpty())
- issueFieldManager.populateFields(issues);
+ if (loadFieldsAndLinks && !issues.isEmpty()) {
+ fieldManager.populateFields(issues);
+ linkManager.populateLinks(issues);
+ }
return issues;
}
@@ -409,7 +409,7 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
undefinedStates.addAll(updater.getUndefinedStates());
}
- for (IssueQueryPersonalization setting: issueQueryPersonalizationManager.query())
+ for (IssueQueryPersonalization setting: queryPersonalizationManager.query())
populateUndefinedStates(undefinedStates, setting.getQueries());
for (User user: userManager.query())
@@ -453,7 +453,7 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
undefinedFields.addAll(updater.getUndefinedFields());
}
- for (IssueQueryPersonalization setting: issueQueryPersonalizationManager.query())
+ for (IssueQueryPersonalization setting: queryPersonalizationManager.query())
populateUndefinedFields(undefinedFields, setting.getQueries());
for (User user: userManager.query())
@@ -502,7 +502,7 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
undefinedFieldValues.addAll(updater.getUndefinedFieldValues());
}
- for (IssueQueryPersonalization setting: issueQueryPersonalizationManager.query())
+ for (IssueQueryPersonalization setting: queryPersonalizationManager.query())
populateUndefinedFieldValues(undefinedFieldValues, setting.getQueries());
for (User user: userManager.query())
@@ -571,7 +571,7 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
updater.fixUndefinedStates(resolutions);
}
- for (IssueQueryPersonalization setting: issueQueryPersonalizationManager.query())
+ for (IssueQueryPersonalization setting: queryPersonalizationManager.query())
fixUndefinedStates(resolutions, setting.getQueries());
for (User user: userManager.query())
@@ -622,7 +622,7 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
updater.fixUndefinedFields(resolutions);
}
- for (IssueQueryPersonalization setting: issueQueryPersonalizationManager.query())
+ for (IssueQueryPersonalization setting: queryPersonalizationManager.query())
fixUndefinedFields(resolutions, setting.getProject(), setting.getQueries());
for (User user: userManager.query())
@@ -680,7 +680,7 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
updater.fixUndefinedFieldValues(resolutions);
}
- for (IssueQueryPersonalization setting: issueQueryPersonalizationManager.query())
+ for (IssueQueryPersonalization setting: queryPersonalizationManager.query())
fixUndefinedFieldValues(resolutions, setting.getProject(), setting.getQueries());
for (User user: userManager.query())
@@ -787,9 +787,13 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
criteriaQuery.where(predicates.toArray(new Predicate[0]));
- criteriaQuery.orderBy(
- builder.desc(root.get(Issue.PROP_PROJECT)),
- builder.desc(root.get(Issue.PROP_NUMBER)));
+ if (scope != null && !scope.getSorts().isEmpty()) {
+ criteriaQuery.orderBy(getOrders(scope.getSorts(), builder, root));
+ } else {
+ criteriaQuery.orderBy(
+ builder.desc(root.get(Issue.PROP_PROJECT)),
+ builder.desc(root.get(Issue.PROP_NUMBER)));
+ }
Query<Issue> query = getSession().createQuery(criteriaQuery);
query.setFirstResult(0);
@@ -821,7 +825,8 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
@Listen
public void on(EntityRemoved event) {
if (event.getEntity() instanceof Project) {
- Long projectId = event.getEntity().getId();
+ Project project = (Project) event.getEntity();
+ Long projectId = project.getId();
transactionManager.runAfterCommit(new Runnable() {
@Override
@@ -940,7 +945,7 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
for (IssueComment comment: issue.getComments()) {
comment.setContent(new ReferenceMigrator(Issue.class, numberMapping)
.migratePrefixed(comment.getContent(), "#"));
- issueCommentManager.save(comment);
+ commentManager.save(comment);
}
save(issue);
}
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
index fae9b2e9ce..63235f10c1 100644
--- 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
@@ -2,18 +2,24 @@ package io.onedev.server.entitymanager.impl;
import java.util.Comparator;
import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
import javax.inject.Inject;
import javax.inject.Singleton;
+import io.onedev.commons.loader.Listen;
import io.onedev.server.entitymanager.LinkSpecManager;
import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.event.system.SystemStarted;
import io.onedev.server.model.LinkSpec;
+import io.onedev.server.persistence.TransactionManager;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.search.entity.issue.IssueQueryUpdater;
+import io.onedev.server.util.facade.LinkSpecFacade;
import io.onedev.server.util.usage.Usage;
@Singleton
@@ -21,27 +27,47 @@ public class DefaultLinkSpecManager extends BaseEntityManager<LinkSpec> implemen
private final SettingManager settingManager;
+ private final TransactionManager transactionManager;
+
+ private final Map<String, Long> ids = new ConcurrentHashMap<>();
+
+ private final Map<Long, LinkSpecFacade> cache = new ConcurrentHashMap<>();
+
@Inject
- public DefaultLinkSpecManager(Dao dao, SettingManager settingManager) {
+ public DefaultLinkSpecManager(Dao dao, SettingManager settingManager, TransactionManager transactionManager) {
super(dao);
this.settingManager = settingManager;
+ this.transactionManager = transactionManager;
}
+ @Sessional
+ @Listen
+ public void on(SystemStarted event) {
+ for (LinkSpec link: query(true)) {
+ ids.put(link.getName(), link.getId());
+
+ String oppositeName = link.getOpposite()!=null?link.getOpposite().getName():null;
+ if (oppositeName != null)
+ ids.put(oppositeName, link.getId());
+ cache.put(link.getId(), new LinkSpecFacade(link.getId(), link.getName(), oppositeName));
+ }
+ }
+
@Sessional
@Override
public LinkSpec find(String name) {
- for (LinkSpec spec: query()) {
- if (spec.getName().equals(name)
- || spec.getOpposite() != null && spec.getOpposite().getName().equalsIgnoreCase(name)) {
- return spec;
- }
+ Long linkId = ids.get(name);
+ if (linkId != null) {
+ LinkSpecFacade facade = cache.get(linkId);
+ if (facade != null && (name.equals(facade.getName()) || name.equals(facade.getOppositeName())))
+ return load(linkId);
}
return null;
}
@Override
public List<LinkSpec> queryAndSort() {
- List<LinkSpec> links = query();
+ List<LinkSpec> links = query(true);
links.sort(Comparator.comparing(LinkSpec::getOrder));
return links;
}
@@ -64,14 +90,14 @@ public class DefaultLinkSpecManager extends BaseEntityManager<LinkSpec> implemen
if (spec.getOpposite() == null) {
Usage usage = new Usage();
usage.add(settingManager.onDeleteLink(oldOppositeName));
- for (LinkSpec link: query()) {
+ for (LinkSpec link: query(true)) {
for (IssueQueryUpdater updater: link.getQueryUpdaters())
usage.add(updater.onDeleteLink(oldOppositeName));
}
usage.checkInUse("Opposite side of issue link '" + oldName + "'");
} else if (!oldOppositeName.equals(spec.getOpposite().getName())){
settingManager.onRenameLink(oldOppositeName, spec.getOpposite().getName());
- for (LinkSpec link: query()) {
+ for (LinkSpec link: query(true)) {
for (IssueQueryUpdater updater: link.getQueryUpdaters())
updater.onRenameLink(oldOppositeName, spec.getOpposite().getName());
}
@@ -79,13 +105,27 @@ public class DefaultLinkSpecManager extends BaseEntityManager<LinkSpec> implemen
}
if (!oldName.equals(spec.getName())) {
settingManager.onRenameLink(oldName, spec.getName());
- for (LinkSpec link: query()) {
+ for (LinkSpec link: query(true)) {
for (IssueQueryUpdater updater: link.getQueryUpdaters())
updater.onRenameLink(oldName, spec.getName());
}
}
}
super.save(spec);
+
+ LinkSpecFacade facade = new LinkSpecFacade(spec);
+
+ transactionManager.runAfterCommit(new Runnable() {
+
+ @Override
+ public void run() {
+ cache.put(facade.getId(), facade);
+ ids.put(facade.getName(), facade.getId());
+ if (facade.getOppositeName() != null)
+ ids.put(facade.getOppositeName(), facade.getId());
+ }
+
+ });
}
@Transactional
@@ -93,7 +133,7 @@ public class DefaultLinkSpecManager extends BaseEntityManager<LinkSpec> implemen
if (spec.getOpposite() != null) {
Usage usage = new Usage();
usage.add(settingManager.onDeleteLink(spec.getOpposite().getName()));
- for (LinkSpec link: query()) {
+ for (LinkSpec link: query(true)) {
for (IssueQueryUpdater updater: link.getQueryUpdaters())
usage.add(updater.onDeleteLink(spec.getOpposite().getName()));
}
@@ -102,13 +142,25 @@ public class DefaultLinkSpecManager extends BaseEntityManager<LinkSpec> implemen
Usage usage = new Usage();
usage.add(settingManager.onDeleteLink(spec.getName()));
- for (LinkSpec link: query()) {
+ for (LinkSpec link: query(true)) {
for (IssueQueryUpdater updater: link.getQueryUpdaters())
usage.add(updater.onDeleteLink(spec.getName()));
}
usage.checkInUse("Issue link '" + spec.getName() + "'");
super.delete(spec);
+
+ transactionManager.runAfterCommit(new Runnable() {
+
+ @Override
+ public void run() {
+ cache.remove(spec.getId());
+ ids.remove(spec.getName());
+ if (spec.getOpposite() != null)
+ ids.remove(spec.getOpposite().getName());
+ }
+
+ });
}
}
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 6d41613f1d..f4c61ef348 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
@@ -917,17 +917,19 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentSt
}
}
- public Collection<Issue> findLinkedIssues(LinkSpec spec, boolean opposite) {
+ public List<Issue> findLinkedIssues(LinkSpec spec, boolean opposite) {
if (spec.getOpposite() != null) {
if (opposite) {
return getSourceLinks().stream()
.filter(it->it.getSpec().equals(spec))
+ .sorted()
.map(it->it.getSource())
.sorted(spec.getOpposite().getParsedIssueQuery(getProject()))
.collect(Collectors.toList());
} else {
return getTargetLinks().stream()
.filter(it->it.getSpec().equals(spec))
+ .sorted()
.map(it->it.getTarget())
.sorted(spec.getParsedIssueQuery(getProject()))
.collect(Collectors.toList());
@@ -935,6 +937,7 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentSt
} else {
return getLinks().stream()
.filter(it->it.getSpec().equals(spec))
+ .sorted()
.map(it->it.getLinked(this))
.sorted(spec.getParsedIssueQuery(getProject()))
.collect(Collectors.toList());
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
index 39d40f4f48..f73de4fc0a 100644
--- a/server-core/src/main/java/io/onedev/server/model/IssueLink.java
+++ b/server-core/src/main/java/io/onedev/server/model/IssueLink.java
@@ -33,7 +33,7 @@ public class IssueLink extends AbstractEntity {
@ManyToOne(fetch=FetchType.LAZY)
@JoinColumn(nullable=false)
private LinkSpec spec;
-
+
public Issue getSource() {
return source;
}
@@ -61,5 +61,5 @@ public class IssueLink extends AbstractEntity {
public Issue getLinked(Issue issue) {
return issue.equals(source)?target:source;
}
-
+
}
diff --git a/server-core/src/main/java/io/onedev/server/model/LinkAuthorization.java b/server-core/src/main/java/io/onedev/server/model/LinkAuthorization.java
index 425df9a17a..aed3a0685f 100644
--- a/server-core/src/main/java/io/onedev/server/model/LinkAuthorization.java
+++ b/server-core/src/main/java/io/onedev/server/model/LinkAuthorization.java
@@ -8,10 +8,14 @@ import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
+
@Entity
@Table(
indexes={@Index(columnList="o_link_id"), @Index(columnList="o_role_id")},
uniqueConstraints={@UniqueConstraint(columnNames={"o_link_id", "o_role_id"})})
+@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)
public class LinkAuthorization extends AbstractEntity {
private static final long serialVersionUID = 1L;
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
index 1fe614e4ed..7c96cfc00a 100644
--- a/server-core/src/main/java/io/onedev/server/model/LinkSpec.java
+++ b/server-core/src/main/java/io/onedev/server/model/LinkSpec.java
@@ -10,6 +10,8 @@ import javax.persistence.Entity;
import javax.persistence.Lob;
import javax.persistence.OneToMany;
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
import org.hibernate.validator.constraints.NotEmpty;
import io.onedev.server.model.support.issue.LinkSpecOpposite;
@@ -20,12 +22,17 @@ import io.onedev.server.util.usage.Usage;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
-@Entity
@Editable
+@Entity
+@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)
public class LinkSpec extends AbstractEntity {
private static final long serialVersionUID = 1L;
+ public static final String PROP_NAME = "name";
+
+ public static final String PROP_OPPOSITE = "opposite";
+
@Column(nullable=false, unique=true)
private String name;
@@ -43,6 +50,7 @@ public class LinkSpec extends AbstractEntity {
private Collection<IssueLink> links = new ArrayList<>();
@OneToMany(mappedBy=LinkAuthorization.PROP_LINK, cascade=CascadeType.REMOVE)
+ @Cache(usage=CacheConcurrencyStrategy.READ_WRITE)
private Collection<LinkAuthorization> authorizations = new ArrayList<>();
@Editable(order=100, description="Name of the link")
diff --git a/server-core/src/main/java/io/onedev/server/model/Role.java b/server-core/src/main/java/io/onedev/server/model/Role.java
index 64da6279b8..43d66e23cc 100644
--- a/server-core/src/main/java/io/onedev/server/model/Role.java
+++ b/server-core/src/main/java/io/onedev/server/model/Role.java
@@ -100,15 +100,19 @@ public class Role extends AbstractEntity implements Permission {
private ArrayList<JobPrivilege> jobPrivileges = new ArrayList<>();
@OneToMany(mappedBy="defaultRole")
+ @Cache(usage=CacheConcurrencyStrategy.READ_WRITE)
private Collection<Project> defaultProjects = new ArrayList<>();
@OneToMany(mappedBy="role", cascade=CascadeType.REMOVE)
+ @Cache(usage=CacheConcurrencyStrategy.READ_WRITE)
private Collection<UserAuthorization> userAuthorizations = new ArrayList<>();
@OneToMany(mappedBy="role", cascade=CascadeType.REMOVE)
+ @Cache(usage=CacheConcurrencyStrategy.READ_WRITE)
private Collection<GroupAuthorization> groupAuthorizations = new ArrayList<>();
@OneToMany(mappedBy=LinkAuthorization.PROP_ROLE, cascade=CascadeType.REMOVE)
+ @Cache(usage=CacheConcurrencyStrategy.READ_WRITE)
private Collection<LinkAuthorization> linkAuthorizations = new ArrayList<>();
@Editable(order=100)
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/HasLinkCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/HasLinkCriteria.java
index d0bebc5f1f..d2f233f10b 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/HasLinkCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/HasLinkCriteria.java
@@ -55,7 +55,7 @@ public class HasLinkCriteria extends Criteria<Issue> {
return builder.exists(linkQuery.where(builder.and(predicates.toArray(new Predicate[0]))));
}
-
+
private LinkSide getLinkSide() {
if (linkSide == null)
linkSide = new LinkSide(linkName);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/LinkMatchCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/LinkMatchCriteria.java
index f8ca607e84..04735aa518 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/LinkMatchCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/LinkMatchCriteria.java
@@ -18,6 +18,10 @@ import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import javax.persistence.criteria.Subquery;
+import org.hibernate.Hibernate;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.IssueLinkManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueLink;
import io.onedev.server.model.LinkSpec;
@@ -117,9 +121,11 @@ public class LinkMatchCriteria extends Criteria<Issue> {
@Override
public boolean matches(Issue issue) {
+ if (!Hibernate.isInitialized(issue.getSourceLinks()) || !Hibernate.isInitialized(issue.getTargetLinks()))
+ OneDev.getInstance(IssueLinkManager.class).loadDeepLinks(issue);
LinkSpec spec = getLinkSide().getSpec();
boolean opposite = getLinkSide().isOpposite();
- if (allMatch) {
+ if (allMatch) {
if (opposite) {
boolean hasLink = false;
for (IssueLink link: issue.getSourceLinks()) {
diff --git a/server-core/src/main/java/io/onedev/server/util/facade/LinkSpecFacade.java b/server-core/src/main/java/io/onedev/server/util/facade/LinkSpecFacade.java
new file mode 100644
index 0000000000..486daaf503
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/util/facade/LinkSpecFacade.java
@@ -0,0 +1,33 @@
+package io.onedev.server.util.facade;
+
+import javax.annotation.Nullable;
+
+import io.onedev.server.model.LinkSpec;
+
+public class LinkSpecFacade extends EntityFacade {
+
+ private static final long serialVersionUID = 1L;
+
+ private final String name;
+
+ private final String oppositeName;
+
+ public LinkSpecFacade(Long id, String name, @Nullable String oppositeName) {
+ super(id);
+ this.name = name;
+ this.oppositeName = oppositeName;
+ }
+
+ public LinkSpecFacade(LinkSpec link) {
+ this(link.getId(), link.getName(), link.getOpposite()!=null?link.getOpposite().getName():null);
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public String getOppositeName() {
+ return oppositeName;
+ }
+
+}
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 4ae3a3cb9f..679d37958c 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
@@ -291,9 +291,9 @@ public class OneUrlMapper extends CompoundRequestMapper {
add(new DynamicPathPageMapper("projects/${project}/pulls/${request}/changes", PullRequestChangesPage.class));
add(new DynamicPathPageMapper("projects/${project}/pulls/${request}/invalid", InvalidPullRequestPage.class));
- add(new DynamicPathPageMapper("projects/${project}/issues/boards", IssueBoardsPage.class));
- add(new DynamicPathPageMapper("projects/${project}/issues/boards/${board}", IssueBoardsPage.class));
- add(new DynamicPathPageMapper("projects/${project}/issues/list", ProjectIssueListPage.class));
+ add(new DynamicPathPageMapper("projects/${project}/boards", IssueBoardsPage.class));
+ add(new DynamicPathPageMapper("projects/${project}/boards/${board}", IssueBoardsPage.class));
+ add(new DynamicPathPageMapper("projects/${project}/issues", ProjectIssueListPage.class));
add(new DynamicPathPageMapper("projects/${project}/issues/${issue}", IssueActivitiesPage.class));
add(new DynamicPathPageMapper("projects/${project}/issues/${issue}/commits", IssueCommitsPage.class));
add(new DynamicPathPageMapper("projects/${project}/issues/${issue}/pull-requests", IssuePullRequestsPage.class));
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/select.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/select.svg
index 04fdc46fe0..99701a838e 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/icon/select.svg
+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/select.svg
@@ -1,71 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:cc="http://creativecommons.org/ns#"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- inkscape:version="1.0 (4035a4f, 2020-05-01)"
- sodipodi:docname="select.svg"
- id="svg28"
- version="1.1"
- viewBox="0 0 1024 1024"
- height="200.00px"
- width="200px"
- class="icon">
- <metadata
- id="metadata34">
- <rdf:RDF>
- <cc:Work
- rdf:about="">
- <dc:format>image/svg+xml</dc:format>
- <dc:type
- rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
- </cc:Work>
- </rdf:RDF>
- </metadata>
- <defs
- id="defs32" />
- <sodipodi:namedview
- inkscape:current-layer="svg28"
- inkscape:window-maximized="1"
- inkscape:window-y="23"
- inkscape:window-x="0"
- inkscape:cy="97.823458"
- inkscape:cx="100"
- inkscape:zoom="4.135"
- showgrid="false"
- id="namedview30"
- inkscape:window-height="971"
- inkscape:window-width="1920"
- inkscape:pageshadow="2"
- inkscape:pageopacity="0"
- guidetolerance="10"
- gridtolerance="10"
- objecttolerance="10"
- borderopacity="1"
- bordercolor="#666666"
- pagecolor="#ffffff" />
- <path
- id="path20"
- d="m 171.81774,815.5953 m -67.2968,0 a 67.296805,67.307673 0 1 0 134.59361,0 67.296805,67.307673 0 1 0 -134.59361,0 z"
- stroke-width="1.0516"
- stroke="currentColor" />
- <path
- id="path22"
- d="M 925.27275,855.97991 H 413.81704 c -22.34253,0 -40.37807,-18.03846 -40.37807,-40.38461 0,-22.34615 18.03554,-40.3846 40.37807,-40.3846 h 511.45571 c 22.34254,0 40.37808,18.03845 40.37808,40.3846 0,22.34615 -18.03554,40.38461 -40.37808,40.38461 z"
- stroke-width="1.0516"
- stroke="#000000" />
- <path
- id="path24"
- d="m 171.81774,561.98 m -67.2968,0 a 67.296805,67.307673 0 1 0 134.59361,0 67.296805,67.307673 0 1 0 -134.59361,0 z"
- stroke-width="1.0516"
- stroke="#000000" />
- <path
- id="path26"
- d="M 925.27275,602.3646 H 413.81704 c -22.34253,0 -40.37807,-18.03846 -40.37807,-40.3846 0,-22.34615 18.03554,-40.38461 40.37807,-40.38461 h 511.45571 c 22.34254,0 40.37808,18.03846 40.37808,40.38461 0,22.34614 -18.03554,40.3846 -40.37808,40.3846 z m 0,-251.99992 H 413.81704 c -22.34253,0 -40.37807,-18.03846 -40.37807,-40.3846 0,-22.34615 18.03554,-40.3846 40.37807,-40.3846 h 511.45571 c 22.34254,0 40.37808,18.03845 40.37808,40.3846 0,22.07692 -18.03554,40.3846 -40.37808,40.3846 z M 412.7403,114.5186 a 40.108895,40.115372 0 0 0 -57.06769,0 L 193.08354,277.13393 125.24836,209.2878 a 40.108895,40.115372 0 0 0 -57.067693,0 40.108895,40.115372 0 0 0 0,57.07691 l 96.099833,96.11535 c 7.80643,7.80769 18.30473,11.84615 28.80304,11.84615 10.4983,0 20.72741,-3.76923 28.80302,-11.84615 L 412.7403,171.59551 c 15.88205,-15.61538 15.88205,-41.19229 0,-57.07691 z"
- stroke-width="1.0516"
- stroke="#000000" />
-</svg>
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1638836867050" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="16990" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M185.6 345.6L108.8 268.8c-12.8-12.8-12.8-32 0-44.8s32-12.8 44.8 0l32 32 76.8-76.8c12.8-12.8 32-12.8 44.8 0s12.8 32 0 44.8L185.6 345.6zM185.6 601.6L108.8 524.8c-12.8-12.8-12.8-32 0-44.8s32-12.8 44.8 0l32 32 76.8-76.8c12.8-12.8 32-12.8 44.8 0s12.8 32 0 44.8L185.6 601.6zM185.6 857.6l-76.8-76.8c-12.8-12.8-12.8-32 0-44.8s32-12.8 44.8 0l32 32 76.8-76.8c12.8-12.8 32-12.8 44.8 0s12.8 32 0 44.8l-121.6 121.6zM864 307.2h-448c-25.6 0-44.8-25.6-44.8-51.2s19.2-51.2 51.2-51.2h448c25.6 0 51.2 19.2 51.2 51.2s-32 51.2-57.6 51.2zM864 563.2h-448c-25.6 0-44.8-25.6-44.8-51.2s19.2-51.2 51.2-51.2h448c25.6 0 51.2 19.2 51.2 51.2s-32 51.2-57.6 51.2zM864 819.2h-448c-25.6 0-51.2-19.2-51.2-51.2s19.2-51.2 51.2-51.2h448c25.6 0 51.2 19.2 51.2 51.2s-25.6 51.2-51.2 51.2z" p-id="16991"></path></svg>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/sort.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/sort.svg
index 3a81d4acca..438a556a0b 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/icon/sort.svg
+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/sort.svg
@@ -7,14 +7,14 @@
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- class="icon"
- width="200px"
- height="200.00px"
- viewBox="0 0 1024 1024"
- version="1.1"
- id="svg12"
+ inkscape:version="1.0 (4035a4f, 2020-05-01)"
sodipodi:docname="sort.svg"
- inkscape:version="1.0 (4035a4f, 2020-05-01)">
+ id="svg12"
+ version="1.1"
+ viewBox="0 0 1024 1024"
+ height="200.00px"
+ width="200px"
+ class="icon">
<metadata
id="metadata18">
<rdf:RDF>
@@ -29,28 +29,28 @@
<defs
id="defs16" />
<sodipodi:namedview
- inkscape:document-rotation="0"
- pagecolor="#ffffff"
- bordercolor="#666666"
- borderopacity="1"
- objecttolerance="10"
- gridtolerance="10"
- guidetolerance="10"
- inkscape:pageopacity="0"
- inkscape:pageshadow="2"
- inkscape:window-width="1920"
- inkscape:window-height="971"
- id="namedview14"
- showgrid="false"
- inkscape:zoom="3.52"
- inkscape:cx="100"
- inkscape:cy="100"
- inkscape:window-x="0"
- inkscape:window-y="23"
+ inkscape:current-layer="svg12"
inkscape:window-maximized="1"
- inkscape:current-layer="svg12" />
+ inkscape:window-y="25"
+ inkscape:window-x="53"
+ inkscape:cy="57.386364"
+ inkscape:cx="100"
+ inkscape:zoom="3.52"
+ showgrid="false"
+ id="namedview14"
+ inkscape:window-height="847"
+ inkscape:window-width="1387"
+ inkscape:pageshadow="2"
+ inkscape:pageopacity="0"
+ guidetolerance="10"
+ gridtolerance="10"
+ objecttolerance="10"
+ borderopacity="1"
+ bordercolor="#666666"
+ pagecolor="#ffffff"
+ inkscape:document-rotation="0" />
<path
- d="M 580.8689,236.68372 H 117.86412 c -27.780292,0 -46.300484,-18.38856 -46.300484,-45.97139 0,-27.58283 18.520192,-45.97139 46.300484,-45.97139 H 580.8689 c 27.78029,0 46.30048,18.38856 46.30048,45.97139 0,27.58283 -18.52019,45.97139 -46.30048,45.97139 z m 0,321.79973 H 117.86412 c -27.780292,0 -46.300484,-18.38857 -46.300484,-45.97141 0,-27.58282 18.520192,-45.97138 46.300484,-45.97138 H 580.8689 c 27.78029,0 46.30048,18.38856 46.30048,45.97138 0,27.58284 -18.52019,45.97141 -46.30048,45.97141 z m 138.90143,367.7711 V 144.74094 c 0,-27.58284 18.52019,-45.97139 46.30048,-45.97139 27.78029,0 46.30048,18.38855 46.30048,45.97139 V 650.42622 H 951.27273 Z M 580.8689,880.28316 H 117.86412 c -27.780292,0 -46.300484,-18.38855 -46.300484,-45.9714 0,-27.58283 18.520192,-45.97138 46.300484,-45.97138 H 580.8689 c 27.78029,0 46.30048,18.38855 46.30048,45.97138 0,27.58285 -18.52019,45.9714 -46.30048,45.9714 z"
+ style="stroke-width:0.829439"
id="path10"
- style="stroke-width:0.901087" />
+ d="M 580.8689,272.57712 H 117.86412 c -27.780292,0 -46.300484,-15.58056 -46.300484,-38.95139 0,-23.37082 18.520192,-38.95138 46.300484,-38.95138 H 580.8689 c 27.78029,0 46.30048,15.58056 46.30048,38.95138 0,23.37083 -18.52019,38.95139 -46.30048,38.95139 z m 0,272.65971 H 117.86412 c -27.780292,0 -46.300484,-15.58058 -46.300484,-38.95141 0,-23.37083 18.520192,-38.95138 46.300484,-38.95138 H 580.8689 c 27.78029,0 46.30048,15.58055 46.30048,38.95138 0,23.37083 -18.52019,38.95141 -46.30048,38.95141 z M 719.77033,856.84789 V 194.67435 c 0,-23.37084 18.52019,-38.95138 46.30048,-38.95138 27.78029,0 46.30048,15.58054 46.30048,38.95138 V 623.13958 H 951.27273 Z M 580.8689,817.8965 H 117.86412 c -27.780292,0 -46.300484,-15.58055 -46.300484,-38.9514 0,-23.37083 18.520192,-38.95137 46.300484,-38.95137 H 580.8689 c 27.78029,0 46.30048,15.58054 46.30048,38.95137 0,23.37085 -18.52019,38.9514 -46.30048,38.9514 z" />
</svg>
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 f232ca7578..b7bd0fc315 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
@@ -8,6 +8,7 @@ import java.util.Map;
import javax.annotation.Nullable;
+import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.behavior.AttributeAppender;
@@ -18,10 +19,9 @@ import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.markup.html.list.ListItem;
-import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.markup.repeater.RepeatingView;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.eclipse.jgit.lib.ObjectId;
@@ -57,6 +57,7 @@ import io.onedev.server.util.Input;
import io.onedev.server.web.ajaxlistener.AttachAjaxIndicatorListener;
import io.onedev.server.web.ajaxlistener.DisableGlobalAjaxIndicatorListener;
import io.onedev.server.web.component.beaneditmodal.BeanEditModalPanel;
+import io.onedev.server.web.component.floating.FloatingPanel;
import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;
import io.onedev.server.web.component.user.ident.Mode;
import io.onedev.server.web.component.user.ident.UserIdentPanel;
@@ -75,9 +76,12 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {
private final Mode userFieldDisplayMode;
- public FieldValuesPanel(String id, Mode userFieldDisplayMode) {
+ private final boolean delayPermissionCheck;
+
+ public FieldValuesPanel(String id, Mode userFieldDisplayMode, boolean delayPermissionCheck) {
super(id);
this.userFieldDisplayMode = userFieldDisplayMode;
+ this.delayPermissionCheck = delayPermissionCheck;
}
private GlobalIssueSetting getIssueSetting() {
@@ -87,6 +91,14 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {
private InplacePropertyEditLink newInplaceEditLink(String componentId) {
return new InplacePropertyEditLink(componentId) {
+ @Override
+ protected Component newContent(String id, FloatingPanel dropdown) {
+ if (delayPermissionCheck && !canEditField())
+ return new Label(id, "<div class='px-3 py-2'><i>No permission to edit field</i></div>").setEscapeModelStrings(false);
+ else
+ return super.newContent(id, dropdown);
+ }
+
@Override
protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
super.updateAjaxAttributes(attributes);
@@ -149,6 +161,8 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {
} else {
OneDev.getInstance(IssueChangeManager.class).changeFields(getIssue(), fieldValues);
}
+
+ FieldValuesPanel.this.onUpdated(handler);
}
@Override
@@ -188,125 +202,129 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {
super.onInitialize();
WebMarkupContainer link;
- if (canEditField()) {
+ if (delayPermissionCheck) {
link = newInplaceEditLink("edit");
link.add(AttributeAppender.append("style", "cursor:pointer;"));
link.add(AttributeAppender.append("class", "editable"));
} else {
- link = new WebMarkupContainer("edit");
+ if (canEditField()) {
+ link = newInplaceEditLink("edit");
+ link.add(AttributeAppender.append("style", "cursor:pointer;"));
+ link.add(AttributeAppender.append("class", "editable"));
+ } else {
+ link = new WebMarkupContainer("edit");
+ }
}
add(link);
if (getField() != null && !getField().getValues().isEmpty()) {
Fragment fragment = new Fragment("content", "nonEmptyValuesFrag", this);
- fragment.add(new ListView<String>("values", getField().getValues()) {
-
- @Override
- protected void populateItem(ListItem<String> item) {
- String value = item.getModelObject();
- if (getField().getType().equals(FieldSpec.USER)) {
- User user = OneDev.getInstance(UserManager.class).findByName(value);
- if (user != null)
- item.add(new UserIdentPanel("value", user, userFieldDisplayMode));
- else
- item.add(new Label("value", value));
- } else if (getField().getType().equals(FieldSpec.ISSUE)) {
- 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));
- 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", "<i>Not Found</i>").setEscapeModelStrings(false));
- }
- } else if (getField().getType().equals(FieldSpec.BUILD)) {
- 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", "<i>Not Found</i>").setEscapeModelStrings(false));
- }
- } else if (getField().getType().equals(FieldSpec.PULL_REQUEST)) {
- 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));
- 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", "<i>Not Found</i>").setEscapeModelStrings(false));
- }
- } else if (getField().getType().equals(FieldSpec.COMMIT)) {
- if (ObjectId.isId(value)) {
- 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));
- }
+ RepeatingView valuesView = new RepeatingView("values");
+ for (String value: getField().getValues()) {
+ WebMarkupContainer valueContainer = new WebMarkupContainer(valuesView.newChildId());
+ valuesView.add(valueContainer);
+ if (getField().getType().equals(FieldSpec.USER)) {
+ User user = OneDev.getInstance(UserManager.class).findByName(value);
+ if (user != null)
+ valueContainer.add(new UserIdentPanel("value", user, userFieldDisplayMode));
+ else
+ valueContainer.add(new Label("value", value));
+ } else if (getField().getType().equals(FieldSpec.ISSUE)) {
+ Issue issue = OneDev.getInstance(IssueManager.class).get(Long.valueOf(value));
+ if (issue != null) {
+ Fragment linkFrag = new Fragment("value", "linkFrag", FieldValuesPanel.this);
+ Link<Void> issueLink = new BookmarkablePageLink<Void>("link", IssueActivitiesPage.class,
+ IssueActivitiesPage.paramsOf(issue));
+ if (issue.getNumberScope().equals(getIssue().getProject().getForkRoot()))
+ issueLink.add(new Label("label", "#" + issue.getNumber()));
+ else
+ issueLink.add(new Label("label", issue.getFQN().toString()));
+ linkFrag.add(issueLink);
+ valueContainer.add(linkFrag);
} else {
- Label label;
- if (getField().getType().equals(ParamSpec.SECRET))
- label = new Label("value", SecretInput.MASK);
- else
- label = new Label("value", value);
+ valueContainer.add(new Label("value", "<i>Not Found</i>").setEscapeModelStrings(false));
+ }
+ } else if (getField().getType().equals(FieldSpec.BUILD)) {
+ Build build = OneDev.getInstance(BuildManager.class).get(Long.valueOf(value));
+ if (build != null) {
+ Fragment linkFrag = new Fragment("value", "linkFrag", FieldValuesPanel.this);
+ Link<Void> buildLink = 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();
- FieldSpec fieldSpec = getIssueSetting().getFieldSpec(getField().getName());
- if (fieldSpec != null && fieldSpec instanceof ChoiceField) {
- ChoiceProvider choiceProvider = ((ChoiceField)fieldSpec).getChoiceProvider();
- ComponentContext.push(new ComponentContext(this));
- try {
- String backgroundColor = choiceProvider.getChoices(false).get(value);
- if (backgroundColor == null)
- backgroundColor = "#E4E6EF";
- String fontColor = ColorUtils.isLight(backgroundColor)?"#3F4254":"white";
- String style = String.format(
- "background-color: %s; color: %s;",
- backgroundColor, fontColor);
- label.add(AttributeAppender.append("style", style));
- label.add(AttributeAppender.append("class", "badge"));
- } finally {
- ComponentContext.pop();
- }
- }
- item.add(label);
+ if (build.getVersion() != null)
+ buildInfo += " (" + build.getVersion() + ")";
+ buildLink.add(new Label("label", buildInfo));
+ linkFrag.add(buildLink);
+ valueContainer.add(linkFrag);
+ } else {
+ valueContainer.add(new Label("value", "<i>Not Found</i>").setEscapeModelStrings(false));
+ }
+ } else if (getField().getType().equals(FieldSpec.PULL_REQUEST)) {
+ PullRequest request = OneDev.getInstance(PullRequestManager.class).get(Long.valueOf(value));
+ if (request != null) {
+ Fragment linkFrag = new Fragment("value", "linkFrag", FieldValuesPanel.this);
+ Link<Void> requestLink = new BookmarkablePageLink<Void>("link", PullRequestActivitiesPage.class,
+ PullRequestActivitiesPage.paramsOf(request));
+ if (request.getNumberScope().equals(getIssue().getProject().getForkRoot()))
+ requestLink.add(new Label("label", "#" + request.getNumber()));
+ else
+ requestLink.add(new Label("label", request.getFQN().toString()));
+ linkFrag.add(requestLink);
+ valueContainer.add(linkFrag);
+ } else {
+ valueContainer.add(new Label("value", "<i>Not Found</i>").setEscapeModelStrings(false));
}
- item.add(AttributeAppender.append("title", getField().getName()));
+ } else if (getField().getType().equals(FieldSpec.COMMIT)) {
+ if (ObjectId.isId(value)) {
+ Fragment commmitFragment = 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);
+ commmitFragment.add(hashLink);
+ hashLink.add(new Label("hash", GitUtils.abbreviateSHA(value)));
+ commmitFragment.add(new CopyToClipboardLink("copyHash", Model.of(value)));
+ valueContainer.add(commmitFragment);
+ } else {
+ valueContainer.add(new Label("value", value));
+ }
+ } else {
+ Label label;
+ if (getField().getType().equals(ParamSpec.SECRET))
+ label = new Label("value", SecretInput.MASK);
+ else
+ label = new Label("value", value);
+
+ FieldSpec fieldSpec = getIssueSetting().getFieldSpec(getField().getName());
+ if (fieldSpec != null && fieldSpec instanceof ChoiceField) {
+ ChoiceProvider choiceProvider = ((ChoiceField)fieldSpec).getChoiceProvider();
+ ComponentContext.push(new ComponentContext(this));
+ try {
+ String backgroundColor = choiceProvider.getChoices(false).get(value);
+ if (backgroundColor == null)
+ backgroundColor = "#E4E6EF";
+ String fontColor = ColorUtils.isLight(backgroundColor)?"#3F4254":"white";
+ String style = String.format(
+ "background-color: %s; color: %s;",
+ backgroundColor, fontColor);
+ label.add(AttributeAppender.append("style", style));
+ label.add(AttributeAppender.append("class", "badge"));
+ } finally {
+ ComponentContext.pop();
+ }
+ }
+ valueContainer.add(label);
}
-
- });
+ valueContainer.add(AttributeAppender.append("title", getField().getName()));
+ }
+ fragment.add(valuesView);
link.add(fragment);
} else if (getField() != null) {
FieldSpec fieldSpec = null;
@@ -356,4 +374,7 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {
@Nullable
protected abstract Input getField();
+ protected void onUpdated(IPartialPageRequestHandler handler) {
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html
index e890624702..045944d748 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html
@@ -43,9 +43,10 @@
<div class="mr-4 flex-grow-1">
<a wicket:id="number" class="number h6 mr-2"></a>
<span wicket:id="title" class="title h6 mr-1"></span>
- <a wicket:id="copy" title="Copy issue number and title" class="copy btn btn-icon btn-xs btn-light btn-hover-primary">
+ <a wicket:id="copy" title="Copy issue number and title" class="copy mr-3 btn btn-icon btn-xs btn-light btn-hover-primary">
<wicket:svg href="copy" class="icon"></wicket:svg>
</a>
+ <a wicket:id="links" class="link link-info d-inline-flex align-items-center mr-2"><span wicket:id="label"></span><wicket:svg href="arrow" class="icon icon-sm"/></a>
</div>
<div class="flex-shrink-0 d-none d-lg-block text-muted">
<span class="votes mr-2" title="Votes">
@@ -60,10 +61,15 @@
<div class="flex-grow-1 d-flex flex-wrap">
<div wicket:id="fields" class="field"></div>
</div>
- <div class="last-update flex-shrink-0 d-none d-lg-block text-muted font-size-sm">
+ <div class="last-update d-none d-lg-block text-muted font-size-sm">
<a wicket:id="user" class="link-gray"></a> <span wicket:id="activity"></span> <span wicket:id="date"></span>
</div>
</div>
+ <wicket:enclosure child="linkedIssues">
+ <div class="linked-issues pl-4">
+ <div wicket:id="linkedIssues" class="linked-issue"><div wicket:id="content"></div></div>
+ </div>
+ </wicket:enclosure>
</wicket:fragment>
<wicket:fragment wicket:id="stateFrag">
<div wicket:id="transit" class="state"><span wicket:id="state"></span></div>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
index 93b9774b04..cb55d3bb90 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
@@ -4,10 +4,9 @@ import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Comparator;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
-import java.util.Set;
+import java.util.concurrent.atomic.AtomicReference;
import javax.annotation.Nullable;
@@ -40,6 +39,8 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.markup.html.navigation.paging.PagingNavigator;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.html.panel.Panel;
@@ -55,16 +56,18 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.IssueLinkManager;
import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.imports.IssueImporter;
import io.onedev.server.imports.IssueImporterContribution;
import io.onedev.server.model.Issue;
+import io.onedev.server.model.IssueLink;
+import io.onedev.server.model.LinkSpec;
import io.onedev.server.model.Project;
import io.onedev.server.model.support.LastUpdate;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
-import io.onedev.server.model.support.issue.TransitionSpec;
import io.onedev.server.model.support.issue.field.spec.ChoiceField;
import io.onedev.server.model.support.issue.field.spec.DateField;
import io.onedev.server.model.support.issue.field.spec.FieldSpec;
@@ -80,6 +83,7 @@ import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.AccessProject;
import io.onedev.server.util.DateUtils;
import io.onedev.server.util.Input;
+import io.onedev.server.util.LinkSide;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.WebSession;
import io.onedev.server.web.ajaxlistener.AttachAjaxIndicatorListener;
@@ -87,7 +91,6 @@ import io.onedev.server.web.ajaxlistener.AttachAjaxIndicatorListener.AttachMode;
import io.onedev.server.web.asset.emoji.Emojis;
import io.onedev.server.web.behavior.IssueQueryBehavior;
import io.onedev.server.web.behavior.NoRecordsBehavior;
-import io.onedev.server.web.behavior.WebSocketObserver;
import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;
import io.onedev.server.web.component.floating.FloatingPanel;
import io.onedev.server.web.component.issue.IssueStateBadge;
@@ -1099,13 +1102,16 @@ public abstract class IssueListPanel extends Panel {
@Override
public void populateItem(Item<ICellPopulator<Issue>> cellItem, String componentId,
IModel<Issue> rowModel) {
- Issue issue = rowModel.getObject();
- Fragment fragment = new Fragment(componentId, "contentFrag", IssueListPanel.this);
Item<?> row = cellItem.findParent(Item.class);
-
Cursor cursor = new Cursor(queryModel.getObject().toString(), (int)issuesTable.getItemCount(),
(int)issuesTable.getCurrentPage() * WebConstants.PAGE_SIZE + row.getIndex(), getProject());
-
+ cellItem.add(newIssueDetail(componentId, rowModel, cursor));
+ }
+
+ private Component newIssueDetail(String componentId, IModel<Issue> issueModel, @Nullable Cursor cursor) {
+ Issue issue = issueModel.getObject();
+ Fragment fragment = new Fragment(componentId, "contentFrag", IssueListPanel.this);
+
String label;
if (getProject() == null)
label = issue.getProject() + "#" + issue.getNumber();
@@ -1155,6 +1161,47 @@ public abstract class IssueListPanel extends Panel {
fragment.add(new CopyToClipboardLink("copy", Model.of(issue.getNumberAndTitle())));
+ AtomicReference<String> expandedLinkName = new AtomicReference<>(null);
+
+ RepeatingView linksView = new RepeatingView("links");
+ for (String linkName: getListLinks()) {
+ int count = 0;
+ for (IssueLink link: issue.getTargetLinks()) {
+ LinkSpec spec = link.getSpec();
+ if (spec.getName().equals(linkName))
+ count++;
+ }
+ for (IssueLink link: issue.getSourceLinks()) {
+ LinkSpec spec = link.getSpec();
+ if (spec.getOpposite() == null || spec.getOpposite().getName().equals(linkName))
+ count++;
+ }
+ if (count != 0) {
+ AjaxLink<Void> link = new AjaxLink<Void>(linksView.newChildId()) {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ if (linkName.equals(expandedLinkName.get()))
+ expandedLinkName.set(null);
+ else
+ expandedLinkName.set(linkName);
+ target.add(fragment);
+ }
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ if (linkName.equals(expandedLinkName.get()))
+ tag.put("class", tag.getAttribute("class") + " expanded");
+ }
+
+ };
+ link.add(new Label("label", linkName));
+ linksView.add(link);
+ }
+ }
+ fragment.add(linksView);
+
fragment.add(new Label("votes", issue.getVoteCount()));
fragment.add(new Label("comments", issue.getCommentCount()));
@@ -1163,44 +1210,51 @@ public abstract class IssueListPanel extends Panel {
if (field.equals(Issue.NAME_STATE)) {
Fragment stateFragment = new Fragment(fieldsView.newChildId(),
"stateFrag", IssueListPanel.this);
- WebMarkupContainer transitLink = new WebMarkupContainer("transit");
- List<TransitionSpec> transitionSpecs = OneDev.getInstance(SettingManager.class)
- .getIssueSetting().getTransitionSpecs();
- if (transitionSpecs.stream().anyMatch(it->it.canTransitManually(issue, null))) {
- transitLink = new TransitionMenuLink("transit") {
+ AjaxLink<Void> transitLink = new TransitionMenuLink("transit") {
- @Override
- protected Issue getIssue() {
- return rowModel.getObject();
- }
-
- };
- transitLink.add(AttributeAppender.append("class", "transit"));
- } else {
- transitLink = new WebMarkupContainer("transit");
- }
+ @Override
+ protected Issue getIssue() {
+ return issueModel.getObject();
+ }
+
+ @Override
+ protected void onTransited(AjaxRequestTarget target) {
+ Component detail = newIssueDetail(componentId, issueModel, cursor);
+ fragment.replaceWith(detail);
+ target.add(detail);
+ }
+
+ };
- transitLink.add(new IssueStateBadge("state", rowModel));
+ transitLink.add(new IssueStateBadge("state", issueModel));
stateFragment.add(transitLink);
fieldsView.add(stateFragment.setOutputMarkupId(true));
} else {
- fieldsView.add(new FieldValuesPanel(fieldsView.newChildId(), Mode.AVATAR_AND_NAME) {
+ fieldsView.add(new FieldValuesPanel(fieldsView.newChildId(), Mode.AVATAR_AND_NAME, true) {
+
+ @Override
+ protected void onUpdated(IPartialPageRequestHandler handler) {
+ Component detail = newIssueDetail(componentId, issueModel, cursor);
+ fragment.replaceWith(detail);
+ handler.add(detail);
+ }
@SuppressWarnings("deprecation")
@Override
protected AttachAjaxIndicatorListener getInplaceEditAjaxIndicator() {
- return new AttachAjaxIndicatorListener(fieldsView.get(fieldsView.size()-1), AttachMode.APPEND, false);
+ return new AttachAjaxIndicatorListener(
+ fieldsView.get(fieldsView.size()-1), AttachMode.APPEND, false);
}
@Override
protected Issue getIssue() {
- return rowModel.getObject();
+ return issueModel.getObject();
}
@Override
protected Input getField() {
- Issue issue = rowModel.getObject();
+ Issue issue = issueModel.getObject();
if (issue.isFieldVisible(field))
return issue.getFieldInputs().get(field);
else
@@ -1221,7 +1275,33 @@ public abstract class IssueListPanel extends Panel {
fragment.add(new Label("date", DateUtils.formatAge(lastUpdate.getDate()))
.add(new AttributeAppender("title", DateUtils.formatDateTime(lastUpdate.getDate()))));
- cellItem.add(fragment);
+ fragment.add(new ListView<Issue>("linkedIssues", new LoadableDetachableModel<List<Issue>>() {
+
+ @Override
+ protected List<Issue> load() {
+ Issue issue = issueModel.getObject();
+ OneDev.getInstance(IssueLinkManager.class).loadDeepLinks(issue);
+ LinkSide side = new LinkSide(expandedLinkName.get());
+ return issueModel.getObject().findLinkedIssues(side.getSpec(), side.isOpposite());
+ }
+
+ }) {
+
+ @Override
+ protected void populateItem(ListItem<Issue> item) {
+ item.add(newIssueDetail("content", item.getModel(), null));
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(expandedLinkName.get() != null);
+ }
+
+ });
+ fragment.setOutputMarkupId(true);
+
+ return fragment;
}
});
@@ -1252,30 +1332,6 @@ public abstract class IssueListPanel extends Panel {
issuesTable.addBottomToolbar(new NoRecordsToolbar(issuesTable));
issuesTable.add(new NoRecordsBehavior());
- add(new WebSocketObserver() {
-
- @Override
- public Collection<String> getObservables() {
- Set<String> observables = new HashSet<>();
- ProjectManager projectManager = OneDev.getInstance(ProjectManager.class);
- if (getProject() != null) {
- observables.add(Issue.getListWebSocketObservable(getProject().getId()));
- for (Project project: getProject().getDescendants())
- observables.add(Issue.getListWebSocketObservable(project.getId()));
- } else {
- for (Project project: projectManager.getPermittedProjects(new AccessProject()))
- observables.add(Issue.getListWebSocketObservable(project.getId()));
- }
- return observables;
- }
-
- @Override
- public void onObservableChanged(IPartialPageRequestHandler handler) {
- handler.add(IssueListPanel.this);
- }
-
- });
-
setOutputMarkupId(true);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.css b/server-core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.css
index a5a30b2357..189e644065 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.css
@@ -18,12 +18,27 @@
background: var(--primary);
}
+.issue-list>div>.body tr.issue .working-indicator {
+ margin-top: 4px;
+}
+
.issue-list .state {
border-bottom: 2px dotted transparent;
-}
-.issue-list .state.transit {
cursor: pointer;
}
-.issue-list .state.transit:hover {
+.issue-list .state:hover {
border-color: var(--gray);
-}
\ No newline at end of file
+}
+
+.issue-list .link.expanded .icon {
+ transform: rotate(90deg);
+}
+
+.issue-list .linked-issues {
+ border-left: 2px dashed var(--secondary);
+}
+.issue-list .linked-issue {
+ margin-top: 0.7rem;
+ padding-top: 1.2rem;
+ border-top: 1px solid var(--light-gray);
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/TransitionMenuLink.java b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/TransitionMenuLink.java
index 57239dcb4a..ba522d20f7 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/TransitionMenuLink.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/TransitionMenuLink.java
@@ -3,10 +3,14 @@ package io.onedev.server.web.component.issue.operation;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.IssueChangeManager;
@@ -24,82 +28,110 @@ import io.onedev.server.web.component.modal.ModalPanel;
@SuppressWarnings("serial")
public abstract class TransitionMenuLink extends MenuLink {
+ private final IModel<List<TransitionSpec>> manualTransitionsModel =
+ new LoadableDetachableModel<List<TransitionSpec>>() {
+
+ @Override
+ protected List<TransitionSpec> load() {
+ return OneDev.getInstance(SettingManager.class).getIssueSetting().getTransitionSpecs()
+ .stream()
+ .filter(it->it.canTransitManually(getIssue(), null))
+ .collect(Collectors.toList());
+ }
+
+ };
+
public TransitionMenuLink(String id) {
super(id);
}
+ @Override
+ protected void onDetach() {
+ manualTransitionsModel.detach();
+ super.onDetach();
+ }
+
+ @Override
+ protected Component newContent(String id, FloatingPanel dropdown) {
+ if (!manualTransitionsModel.getObject().isEmpty()) {
+ return super.newContent(id, dropdown);
+ } else {
+ return new Label(id, "<div class='px-3 py-2'><i>No applicable transitions or no permission to transit</i></div>")
+ .setEscapeModelStrings(false);
+ }
+ }
+
@Override
protected List<MenuItem> getMenuItems(FloatingPanel dropdown) {
List<MenuItem> menuItems = new ArrayList<>();
- List<TransitionSpec> transitions = OneDev.getInstance(SettingManager.class).getIssueSetting().getTransitionSpecs();
-
- for (TransitionSpec transition: transitions) {
- if (transition.canTransitManually(getIssue(), null)) {
- PressButtonTrigger trigger = (PressButtonTrigger) transition.getTrigger();
- menuItems.add(new MenuItem() {
-
- @Override
- public String getLabel() {
- return trigger.getButtonLabel();
- }
-
- @Override
- public WebMarkupContainer newLink(String id) {
- return new ModalLink(id) {
-
- @Override
- protected String getModalCssClass() {
- return "modal-lg";
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- super.onClick(target);
- dropdown.close();
- }
-
- @Override
- protected Component newContent(String id, ModalPanel modal) {
- return new TransitionOptionPanel(id) {
-
- @Override
- protected Issue getIssue() {
- return TransitionMenuLink.this.getIssue();
- }
-
- @Override
- protected PressButtonTrigger getTrigger() {
- return trigger;
- }
-
- @Override
- protected void onTransit(AjaxRequestTarget target, Map<String, Object> fieldValues,
- String comment) {
- IssueChangeManager manager = OneDev.getInstance(IssueChangeManager.class);
- manager.changeState(getIssue(), transition.getToState(), fieldValues,
- transition.getRemoveFields(), comment);
- modal.close();
- }
-
- @Override
- protected void onCancel(AjaxRequestTarget target) {
- modal.close();
- }
-
- };
- }
-
- };
- }
-
- });
- }
+ for (TransitionSpec transition: manualTransitionsModel.getObject()) {
+ PressButtonTrigger trigger = (PressButtonTrigger) transition.getTrigger();
+ menuItems.add(new MenuItem() {
+
+ @Override
+ public String getLabel() {
+ return trigger.getButtonLabel();
+ }
+
+ @Override
+ public WebMarkupContainer newLink(String id) {
+ return new ModalLink(id) {
+
+ @Override
+ protected String getModalCssClass() {
+ return "modal-lg";
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ super.onClick(target);
+ dropdown.close();
+ }
+
+ @Override
+ protected Component newContent(String id, ModalPanel modal) {
+ return new TransitionOptionPanel(id) {
+
+ @Override
+ protected Issue getIssue() {
+ return TransitionMenuLink.this.getIssue();
+ }
+
+ @Override
+ protected PressButtonTrigger getTrigger() {
+ return trigger;
+ }
+
+ @Override
+ protected void onTransit(AjaxRequestTarget target, Map<String, Object> fieldValues,
+ String comment) {
+ IssueChangeManager manager = OneDev.getInstance(IssueChangeManager.class);
+ manager.changeState(getIssue(), transition.getToState(), fieldValues,
+ transition.getRemoveFields(), comment);
+ modal.close();
+ TransitionMenuLink.this.onTransited(target);
+ }
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ modal.close();
+ }
+
+ };
+ }
+
+ };
+ }
+
+ });
}
- return menuItems;
+ return menuItems;
}
protected abstract Issue getIssue();
+ protected abstract void onTransited(AjaxRequestTarget target);
+
}
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 68d24dfe58..cf86a5fa2c 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
@@ -182,7 +182,7 @@ public abstract class IssueSidePanel extends Panel {
protected void populateItem(ListItem<Input> item) {
Input field = item.getModelObject();
item.add(new Label("name", field.getName()));
- item.add(new FieldValuesPanel("values", Mode.NAME) {
+ item.add(new FieldValuesPanel("values", Mode.NAME, false) {
@Override
protected AttachAjaxIndicatorListener getInplaceEditAjaxIndicator() {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.html
index 8664609c4a..7f016bf3f7 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.html
@@ -1,16 +1,25 @@
<wicket:panel>
- <div class="head d-flex flex-wrap align-items-center mb-2">
- <div wicket:id="transit" class="state">
- <span wicket:id="state" class="mb-2 mr-2"></span>
+ <div wicket:id="content"></div>
+ <wicket:fragment wicket:id="contentFrag">
+ <div class="primary font-weight-bold mb-3">
+ <a wicket:id="number" class="mr-2"></a>
+ <span wicket:id="title" class="mr-3"></span>
+ <a wicket:id="links" class="link-info font-weight-normal link d-inline-flex align-items-center mr-2"><span wicket:id="label"></span><wicket:svg href="arrow" class="icon icon-sm"/></a>
+ <a wicket:id="showDetail" title="Click to show issue details" class="show-detail"><wicket:svg href="ellipsis" class="icon"/></a>
</div>
- <div wicket:id="fields" class="field"></div>
- <div class="avatars ml-auto d-flex flex-wrap mr-n2">
- <div wicket:id="avatars" class="avatar"></div>
+ <div class="secondary d-flex flex-wrap align-items-center mb-n2">
+ <div wicket:id="transit" class="state">
+ <span wicket:id="state" class="mb-2 mr-2"></span>
+ </div>
+ <div wicket:id="fields" class="field"></div>
+ <div class="avatars ml-auto d-flex flex-wrap mr-n2">
+ <div wicket:id="avatars" class="avatar"></div>
+ </div>
</div>
- </div>
- <div class="body font-weight-bold d-flex flex-wrap">
- <a wicket:id="number" class="mr-2"></a>
- <span wicket:id="title" class="mr-4"></span>
- <a wicket:id="detail" class="ml-auto" title="Click to show issue details"><wicket:svg href="ellipsis" class="icon"/></a>
- </div>
+ <wicket:enclosure child="linkedIssues">
+ <div class="linked-issues pl-3">
+ <div wicket:id="linkedIssues" class="linked-issue"><div wicket:id="content"></div></div>
+ </div>
+ </wicket:enclosure>
+ </wicket:fragment>
</wicket:panel>
\ No newline at end of file
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 7edd6b9c96..260634b63b 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
@@ -1,16 +1,23 @@
package io.onedev.server.web.page.project.issues.boards;
import java.util.List;
+import java.util.concurrent.atomic.AtomicReference;
+
+import javax.annotation.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.CallbackParameter;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.event.Broadcast;
+import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
-import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.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.GenericPanel;
import org.apache.wicket.markup.repeater.RepeatingView;
import org.apache.wicket.model.AbstractReadOnlyModel;
@@ -21,15 +28,18 @@ import org.apache.wicket.request.cycle.RequestCycle;
import org.hibernate.Hibernate;
import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.IssueLinkManager;
import io.onedev.server.entitymanager.IssueManager;
-import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.Issue;
+import io.onedev.server.model.IssueLink;
+import io.onedev.server.model.LinkSpec;
import io.onedev.server.model.Milestone;
import io.onedev.server.model.Project;
-import io.onedev.server.model.support.issue.TransitionSpec;
+import io.onedev.server.model.support.issue.BoardSpec;
import io.onedev.server.model.support.issue.field.spec.FieldSpec;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.Input;
+import io.onedev.server.util.LinkSide;
import io.onedev.server.web.WebSession;
import io.onedev.server.web.ajaxlistener.AttachAjaxIndicatorListener;
import io.onedev.server.web.ajaxlistener.AttachAjaxIndicatorListener.AttachMode;
@@ -62,57 +72,55 @@ abstract class BoardCardPanel extends GenericPanel<Issue> {
return getModelObject();
}
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- List<String> displayFields = ((IssueBoardsPage)getPage()).getBoard().getDisplayFields();
+ private Component newContent(String componentId, IModel<Issue> issueModel, @Nullable Cursor cursor) {
+ Issue issue = issueModel.getObject();
- WebMarkupContainer transitLink;
- List<TransitionSpec> transitionSpecs = OneDev.getInstance(SettingManager.class)
- .getIssueSetting().getTransitionSpecs();
+ Fragment fragment = new Fragment(componentId, "contentFrag", this);
- if (transitionSpecs.stream().anyMatch(it->it.canTransitManually(getIssue(), null))) {
- transitLink = new TransitionMenuLink("transit") {
+ BoardSpec board = ((IssueBoardsPage)getPage()).getBoard();
- @Override
- protected Issue getIssue() {
- return BoardCardPanel.this.getIssue();
- }
-
- };
- transitLink.add(AttributeAppender.append("class", "transit"));
- } else {
- transitLink = new WebMarkupContainer("transit");
- }
+ List<String> displayFields = board.getDisplayFields();
+
+ AjaxLink<Void> transitLink = new TransitionMenuLink("transit") {
+
+ @Override
+ protected Issue getIssue() {
+ return issueModel.getObject();
+ }
+
+ @Override
+ protected void onTransited(AjaxRequestTarget target) {
+ }
+
+ };
transitLink.setVisible(displayFields.contains(Issue.NAME_STATE));
transitLink.add(new IssueStateBadge("state", new AbstractReadOnlyModel<Issue>() {
@Override
public Issue getObject() {
- return getIssue();
+ return issueModel.getObject();
}
}));
- add(transitLink);
-
+ fragment.add(transitLink);
+
RepeatingView fieldsView = new RepeatingView("fields");
for (String fieldName: displayFields) {
if (!fieldName.equals(Issue.NAME_STATE)) {
- Input field = getIssue().getFieldInputs().get(fieldName);
+ Input field = issue.getFieldInputs().get(fieldName);
if (field != null && !field.getType().equals(FieldSpec.USER) && !field.getValues().isEmpty()) {
- fieldsView.add(new FieldValuesPanel(fieldsView.newChildId(), Mode.AVATAR) {
+ fieldsView.add(new FieldValuesPanel(fieldsView.newChildId(), Mode.AVATAR, true) {
@Override
protected Issue getIssue() {
- return BoardCardPanel.this.getIssue();
+ return issueModel.getObject();
}
@Override
protected Input getField() {
- if (getIssue().isFieldVisible(fieldName))
+ if (issueModel.getObject().isFieldVisible(fieldName))
return field;
else
return null;
@@ -121,7 +129,8 @@ abstract class BoardCardPanel extends GenericPanel<Issue> {
@SuppressWarnings("deprecation")
@Override
protected AttachAjaxIndicatorListener getInplaceEditAjaxIndicator() {
- return new AttachAjaxIndicatorListener(fieldsView.get(fieldsView.size()-1), AttachMode.APPEND, false);
+ return new AttachAjaxIndicatorListener(
+ fieldsView.get(fieldsView.size()-1), AttachMode.APPEND, false);
}
}.setOutputMarkupId(true));
@@ -129,13 +138,13 @@ abstract class BoardCardPanel extends GenericPanel<Issue> {
}
}
- add(fieldsView);
+ fragment.add(fieldsView);
RepeatingView avatarsView = new RepeatingView("avatars");
for (String fieldName: displayFields) {
- Input field = getIssue().getFieldInputs().get(fieldName);
+ Input field = issue.getFieldInputs().get(fieldName);
if (field != null && field.getType().equals(FieldSpec.USER) && !field.getValues().isEmpty()) {
- avatarsView.add(new FieldValuesPanel(avatarsView.newChildId(), Mode.AVATAR) {
+ avatarsView.add(new FieldValuesPanel(avatarsView.newChildId(), Mode.AVATAR, true) {
@SuppressWarnings("deprecation")
@Override
@@ -145,12 +154,12 @@ abstract class BoardCardPanel extends GenericPanel<Issue> {
@Override
protected Issue getIssue() {
- return BoardCardPanel.this.getIssue();
+ return issueModel.getObject();
}
@Override
protected Input getField() {
- if (getIssue().isFieldVisible(fieldName))
+ if (issueModel.getObject().isFieldVisible(fieldName))
return field;
else
return null;
@@ -160,11 +169,11 @@ abstract class BoardCardPanel extends GenericPanel<Issue> {
}
}
- add(avatarsView);
+ fragment.add(avatarsView);
BasePage page = (BasePage) getPage();
- add(new ModalLink("detail") {
+ fragment.add(new ModalLink("showDetail") {
@Override
protected String getModalCssClass() {
@@ -230,26 +239,27 @@ abstract class BoardCardPanel extends GenericPanel<Issue> {
@Override
protected Component newContent(String id, ModalPanel modal) {
- return newCardDetail(id, modal, BoardCardPanel.this.getModel(), getCursor());
+ return newCardDetail(id, modal, BoardCardPanel.this.getModel(), cursor);
}
});
ActionablePageLink<Void> numberLink;
- add(numberLink = new ActionablePageLink<Void>("number",
- IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(getIssue())) {
+ fragment.add(numberLink = new ActionablePageLink<Void>("number",
+ IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(issue)) {
@Override
public IModel<?> getBody() {
- if (getProject().equals(getIssue().getProject()))
- return Model.of("#" + getIssue().getNumber());
+ Issue issue = issueModel.getObject();
+ if (getProject().equals(issue.getProject()))
+ return Model.of("#" + issue.getNumber());
else
- return Model.of(getIssue().getProject() + "#" + getIssue().getNumber());
+ return Model.of(issue.getProject() + "#" + issue.getNumber());
}
@Override
protected void doBeforeNav(AjaxRequestTarget target) {
- WebSession.get().setIssueCursor(getCursor());
+ WebSession.get().setIssueCursor(cursor);
String redirectUrlAfterDelete = RequestCycle.get().urlFor(
getPage().getClass(), getPage().getPageParameters()).toString();
@@ -259,11 +269,11 @@ abstract class BoardCardPanel extends GenericPanel<Issue> {
});
String url = RequestCycle.get().urlFor(IssueActivitiesPage.class,
- IssueActivitiesPage.paramsOf(getIssue())).toString();
+ IssueActivitiesPage.paramsOf(issue)).toString();
- ReferenceTransformer transformer = new ReferenceTransformer(getIssue().getProject(), url);
+ ReferenceTransformer transformer = new ReferenceTransformer(issue.getProject(), url);
- add(new Label("title", Emojis.getInstance().apply(transformer.apply(getIssue().getTitle()))) {
+ fragment.add(new Label("title", Emojis.getInstance().apply(transformer.apply(issue.getTitle()))) {
@Override
public void renderHead(IHeaderResponse response) {
@@ -279,6 +289,83 @@ abstract class BoardCardPanel extends GenericPanel<Issue> {
}.setEscapeModelStrings(false).setOutputMarkupId(true));
+ AtomicReference<String> expandedLinkName = new AtomicReference<>(null);
+ RepeatingView linksView = new RepeatingView("links");
+
+ for (String linkName: board.getDisplayLinks()) {
+ int count = 0;
+ for (IssueLink link: issue.getTargetLinks()) {
+ LinkSpec spec = link.getSpec();
+ if (spec.getName().equals(linkName))
+ count++;
+ }
+ for (IssueLink link: issue.getSourceLinks()) {
+ LinkSpec spec = link.getSpec();
+ if (spec.getOpposite() == null || spec.getOpposite().getName().equals(linkName))
+ count++;
+ }
+ if (count != 0) {
+ AjaxLink<Void> link = new AjaxLink<Void>(linksView.newChildId()) {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ if (linkName.equals(expandedLinkName.get()))
+ expandedLinkName.set(null);
+ else
+ expandedLinkName.set(linkName);
+ target.add(fragment);
+ }
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ if (linkName.equals(expandedLinkName.get()))
+ tag.put("class", tag.getAttribute("class") + " expanded");
+ }
+
+ };
+ link.add(new Label("label", linkName));
+ linksView.add(link);
+ }
+ }
+ fragment.add(linksView);
+
+ fragment.add(new ListView<Issue>("linkedIssues", new LoadableDetachableModel<List<Issue>>() {
+
+ @Override
+ protected List<Issue> load() {
+ Issue issue = issueModel.getObject();
+ OneDev.getInstance(IssueLinkManager.class).loadDeepLinks(issue);
+ LinkSide side = new LinkSide(expandedLinkName.get());
+ return issueModel.getObject().findLinkedIssues(side.getSpec(), side.isOpposite());
+ }
+
+ }) {
+
+ @Override
+ protected void populateItem(ListItem<Issue> item) {
+ item.add(newContent("content", item.getModel(), null));
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(expandedLinkName.get() != null);
+ }
+
+ });
+
+ fragment.setOutputMarkupId(true);
+
+ return fragment;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(newContent("content", getModel(), getCursor()));
+
add(AttributeAppender.append("data-issue", getIssue().getId()));
if (SecurityUtils.getUser() != null)
@@ -308,7 +395,7 @@ abstract class BoardCardPanel extends GenericPanel<Issue> {
setOutputMarkupId(true);
}
-
+
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.css b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.css
index 22d157a07b..e4d0e19029 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.css
@@ -54,13 +54,40 @@
box-shadow: 0px 0px 3px 1px rgba(0, 0, 0, 0.15);
position: relative;
}
+.issue-boards>.body .board-card .primary {
+ position: relative;
+ padding-right: 20px;
+}
+.issue-boards>.body .board-card .primary .show-detail {
+ position: absolute;
+ right: 0;
+ top: 0;
+}
+.issue-boards>.body .board-card .secondary .working-indicator {
+ margin-bottom: 6px;
+}
+.issue-boards>.body .board-card .secondary .avatars .working-indicator {
+ margin-top: 2px;
+ margin-bottom: 0;
+}
+.issue-boards>.body .board-card .link.expanded .icon {
+ transform: rotate(90deg);
+}
+
+.issue-boards>.body .board-card .linked-issues {
+ border-left: 2px dashed var(--secondary);
+}
+.issue-boards>.body .board-card .linked-issue {
+ margin-top: 0.7rem;
+ padding-top: 0.8rem;
+ border-top: 1px solid var(--light-gray);
+}
+
.issue-boards>.body .board-card .state {
border-bottom: 2px dotted transparent;
-}
-.issue-boards>.body .board-card .state.transit {
cursor: pointer;
}
-.issue-boards>.body .board-card .state.transit:hover {
+.issue-boards>.body .board-card .state:hover {
border-color: var(--gray);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java
index 47f51282be..4b09abd234 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java
@@ -3,8 +3,6 @@ package io.onedev.server.web.page.project.issues.detail;
import java.util.ArrayList;
import java.util.List;
-import javax.persistence.EntityNotFoundException;
-
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.Component;
import org.apache.wicket.Page;
@@ -28,6 +26,7 @@ import org.apache.wicket.request.flow.RedirectToUrlException;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.IssueLinkManager;
import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.infomanager.UserInfoManager;
@@ -78,13 +77,11 @@ public abstract class IssueDetailPage extends ProjectIssuesPage implements Input
@Override
protected Issue load() {
Long issueNumber = Long.valueOf(issueNumberString);
- Issue issue = OneDev.getInstance(IssueManager.class).find(getProject(), issueNumber);
- if (issue == null)
- throw new EntityNotFoundException("Unable to find issue #" + issueNumber + " in project " + getProject());
- else if (!issue.getProject().equals(getProject()))
+ Issue issue = getIssueManager().find(getProject(), issueNumber);
+ OneDev.getInstance(IssueLinkManager.class).loadDeepLinks(issue);
+ if (!issue.getProject().equals(getProject()))
throw new RestartResponseException(getPageClass(), paramsOf(issue));
- else
- return issue;
+ return issue;
}
};
@@ -163,7 +160,7 @@ public abstract class IssueDetailPage extends ProjectIssuesPage implements Input
@Override
public void onClick() {
- OneDev.getInstance(IssueManager.class).delete(getIssue());
+ getIssueManager().delete(getIssue());
Session.get().success("Issue #" + getIssue().getNumber() + " deleted");
String redirectUrlAfterDelete = WebSession.get().getRedirectUrlAfterDelete(Issue.class);
@@ -196,11 +193,10 @@ public abstract class IssueDetailPage extends ProjectIssuesPage implements Input
@Override
protected List<Issue> query(EntityQuery<Issue> query, int offset, int count, Project project) {
- IssueManager issueManager = OneDev.getInstance(IssueManager.class);
if (project != null)
- return issueManager.query(project, true, query, offset, count, false);
+ return getIssueManager().query(project, true, query, offset, count, false);
else
- return issueManager.query(query, offset, count, false);
+ return getIssueManager().query(query, offset, count, false);
}
@Override
@@ -317,6 +313,10 @@ public abstract class IssueDetailPage extends ProjectIssuesPage implements Input
}
+ private IssueManager getIssueManager() {
+ return OneDev.getInstance(IssueManager.class);
+ }
+
@Override
protected Component newProjectTitle(String componentId) {
Fragment fragment = new Fragment(componentId, "projectTitleFrag", this);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.html b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.html
index b47194918b..795b443f3a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.html
@@ -1,2 +1,3 @@
<wicket:extend>
+ <a wicket:id="test">test</a>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
index 066be5dd6a..c331d117bb 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
@@ -3,6 +3,7 @@ package io.onedev.server.web.page.test;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
+import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.web.page.base.BasePage;
@@ -17,6 +18,14 @@ public class TestPage extends BasePage {
@Override
protected void onInitialize() {
super.onInitialize();
+
+ add(new Link<Void>("test") {
+
+ @Override
+ public void onClick() {
+ }
+
+ });
}
@Override