Skip to content

The Unified and Autonomous Development Platform

Add applicable issues for linking

Robin Shen47a61373be8f
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 b96f0bfd17..4cb0a2c210 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
@@ -47,7 +47,7 @@ public interface IssueManager extends EntityManager<Issue> {
int count(Project project, boolean inTree, @Nullable IssueCriteria issueCriteria);
- List<Issue> query(Project project, String term, int count);
+ List<Issue> query(@Nullable EntityQuery<Issue> scope, Project project, String term, int count);
Collection<String> getUndefinedStates();
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 294df0b64f..793c6b4557 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
@@ -1,16 +1,15 @@
package io.onedev.server.entitymanager.impl;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
-import java.util.stream.Collectors;
import javax.annotation.Nullable;
import javax.inject.Inject;
@@ -24,7 +23,6 @@ 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;
import org.hibernate.criterion.Restrictions;
import org.hibernate.query.Query;
@@ -32,7 +30,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.base.Preconditions;
-import com.google.common.collect.Sets;
import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.commons.loader.Listen;
@@ -265,7 +262,7 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
@Sessional
@Override
- public List<Issue> query(EntityQuery<Issue> issueQuery, int firstResult, int maxResults,
+ public List<Issue> query(EntityQuery<Issue> issueQuery, int firstResult, int maxResults,
boolean loadFields) {
CriteriaBuilder builder = getSession().getCriteriaBuilder();
CriteriaQuery<Issue> criteriaQuery = builder.createQuery(Issue.class);
@@ -698,9 +695,7 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
@Sessional
@Override
- public List<Issue> query(Project project, String term, int count) {
- EntityCriteria<Issue> criteria = newCriteria();
-
+ public List<Issue> query(EntityQuery<Issue> scope, Project project, String term, int count) {
if (term.contains("#")) {
String projectPath = StringUtils.substringBefore(term, "#");
Project specifiedProject = projectManager.find(projectPath);
@@ -709,26 +704,46 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
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));
+
+ CriteriaBuilder builder = getSession().getCriteriaBuilder();
+ CriteriaQuery<Issue> criteriaQuery = builder.createQuery(Issue.class);
+ Root<Issue> root = criteriaQuery.from(Issue.class);
+
+ List<Predicate> predicates = new ArrayList<>();
+
+ if (scope != null)
+ predicates.addAll(Arrays.asList(getPredicates(scope.getCriteria(), criteriaQuery, builder, root)));
+
+ List<Predicate> projectPredicates = new ArrayList<>();
+ projectPredicates.add(builder.equal(root.get(Issue.PROP_PROJECT), project));
+ for (Project forkParent: project.getForkParents()) {
+ if (SecurityUtils.canAccess(forkParent))
+ projectPredicates.add(builder.equal(root.get(Issue.PROP_PROJECT), forkParent));
+ }
+ predicates.add(builder.or(projectPredicates.toArray(new Predicate[0])));
if (term.startsWith("#"))
term = term.substring(1);
if (term.length() != 0) {
try {
long buildNumber = Long.parseLong(term);
- criteria.add(Restrictions.eq(Issue.PROP_NUMBER, buildNumber));
+ predicates.add(builder.equal(root.get(Issue.PROP_NUMBER), buildNumber));
} catch (NumberFormatException e) {
- criteria.add(Restrictions.or(
- Restrictions.ilike(Issue.PROP_TITLE, term, MatchMode.ANYWHERE),
- Restrictions.ilike(Issue.PROP_NO_SPACE_TITLE, term, MatchMode.ANYWHERE)));
+ predicates.add(builder.or(
+ builder.like(builder.lower(root.get(Issue.PROP_TITLE)), "%" + term.toLowerCase() + "%"),
+ builder.like(builder.lower(root.get(Issue.PROP_NO_SPACE_TITLE)), "%" + term.toLowerCase() + "%")));
}
}
- criteria.addOrder(Order.desc(Issue.PROP_PROJECT));
- criteria.addOrder(Order.desc(Issue.PROP_NUMBER));
- return query(criteria, 0, count);
+ criteriaQuery.where(predicates.toArray(new Predicate[0]));
+ 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);
+ query.setMaxResults(count);
+ return query.getResultList();
}
@Transactional
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 90d73d2ca5..e9bbcdebf1 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
@@ -13,6 +13,8 @@ import org.hibernate.validator.constraints.NotEmpty;
import io.onedev.server.model.support.issue.LinkSpecOpposite;
import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.web.editable.annotation.IssueQuery;
+import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
@Entity
@Editable
@@ -25,6 +27,8 @@ public class LinkSpec extends AbstractEntity {
private boolean multiple;
+ private String issueQuery;
+
@Lob
@Column(length=65535)
private LinkSpecOpposite opposite;
@@ -51,6 +55,19 @@ public class LinkSpec extends AbstractEntity {
this.multiple = multiple;
}
+
+ @Editable(order=160, name="Linkable Issues", description="Optionally specify criteria of issues which can be linked")
+ @IssueQuery(withCurrentBuildCriteria=false, withCurrentCommitCriteria=false, withCurrentPullRequestCriteria=false,
+ withCurrentUserCriteria=false, withOrder=false)
+ @NameOfEmptyValue("All issues")
+ public String getIssueQuery() {
+ return issueQuery;
+ }
+
+ public void setIssueQuery(String issueQuery) {
+ this.issueQuery = issueQuery;
+ }
+
@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() {
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
index d73f960b6f..5d96088a27 100644
--- 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
@@ -5,6 +5,8 @@ import java.io.Serializable;
import org.hibernate.validator.constraints.NotEmpty;
import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.web.editable.annotation.IssueQuery;
+import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
@Editable
public class LinkSpecOpposite implements Serializable {
@@ -15,6 +17,8 @@ public class LinkSpecOpposite implements Serializable {
private boolean multiple;
+ private String issueQuery;
+
@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
@@ -37,4 +41,17 @@ public class LinkSpecOpposite implements Serializable {
this.multiple = multiple;
}
+ @Editable(order=300, name="Linkable Issues On the Other Side", description="Optionally specify criteria of "
+ + "issues which can be linked on the other side")
+ @IssueQuery(withCurrentBuildCriteria=false, withCurrentCommitCriteria=false, withCurrentPullRequestCriteria=false,
+ withCurrentUserCriteria=false, withOrder=false)
+ @NameOfEmptyValue("All issues")
+ public String getIssueQuery() {
+ return issueQuery;
+ }
+
+ public void setIssueQuery(String issueQuery) {
+ this.issueQuery = issueQuery;
+ }
+
}
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
index dfbac2f2e0..e230e1b596 100644
--- 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
@@ -17,7 +17,7 @@ public abstract class IssueAddChoice extends SelectToAddChoice<Issue> {
protected void onInitialize() {
super.onInitialize();
- getSettings().setPlaceholder("Add Issue...");
+ getSettings().setPlaceholder(getPlaceholder());
getSettings().setFormatResult("onedev.server.issueChoiceFormatter.formatResult");
getSettings().setFormatSelection("onedev.server.issueChoiceFormatter.formatSelection");
getSettings().setEscapeMarkup("onedev.server.issueChoiceFormatter.escapeMarkup");
@@ -30,4 +30,8 @@ public abstract class IssueAddChoice extends SelectToAddChoice<Issue> {
response.render(JavaScriptHeaderItem.forReference(new IssueChoiceResourceReference()));
}
+ protected String getPlaceholder() {
+ return "Add Issue...";
+ }
+
}
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 5fa41bc6e4..3b8f90c1ce 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
@@ -3,7 +3,8 @@ package io.onedev.server.web.component.issue.choice;
import java.util.Collection;
import java.util.List;
-import org.apache.wicket.model.IModel;
+import javax.annotation.Nullable;
+
import org.hibernate.Hibernate;
import org.json.JSONException;
import org.json.JSONWriter;
@@ -15,35 +16,26 @@ 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.search.entity.EntityQuery;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.asset.emoji.Emojis;
import io.onedev.server.web.component.select2.ChoiceProvider;
import io.onedev.server.web.component.select2.Response;
import io.onedev.server.web.component.select2.ResponseFiller;
-public class IssueChoiceProvider extends ChoiceProvider<Issue> {
+public abstract class IssueChoiceProvider extends ChoiceProvider<Issue> {
private static final long serialVersionUID = 1L;
- private final IModel<Project> projectModel;
-
- public IssueChoiceProvider(IModel<Project> projectModel) {
- this.projectModel = projectModel;
- }
+ protected abstract Project getProject();
- @Override
- public void detach() {
- projectModel.detach();
- super.detach();
- }
-
@Override
public void toJson(Issue choice, JSONWriter writer) throws JSONException {
writer
.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()))
+ if (!choice.getNumberScope().equals(getProject().getForkRoot()))
writer.key("project").value(HtmlEscape.escapeHtml5(choice.getProject().getPath()));
}
@@ -59,11 +51,16 @@ public class IssueChoiceProvider extends ChoiceProvider<Issue> {
return issues;
}
+ @Nullable
+ protected EntityQuery<Issue> getScope() {
+ return null;
+ }
+
@Override
public void query(String term, int page, Response<Issue> response) {
int count = (page+1) * WebConstants.PAGE_SIZE + 1;
- Project project = projectModel.getObject();
- List<Issue> issues = OneDev.getInstance(IssueManager.class).query(project, term, count);
+ List<Issue> issues = OneDev.getInstance(IssueManager.class)
+ .query(getScope(), getProject(), term, count);
new ResponseFiller<>(response).fill(issues, page, WebConstants.PAGE_SIZE);
}
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 c48e5abd84..fcebbed8bd 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
@@ -67,9 +67,9 @@
</wicket:fragment>
<wicket:fragment wicket:id="linkedIssueFrag">
<div class="bg-light rounded p-3">
- <div class="d-flex number-and-state mb-2">
+ <div class="d-flex align-items-center 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>
+ <a wicket:id="delete" class="mr-2 mb-1"><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">
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 8755e8df97..67082711e7 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
@@ -53,6 +53,7 @@ import io.onedev.server.model.Milestone;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.model.support.EntityWatch;
+import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.search.entity.issue.StateCriteria;
import io.onedev.server.security.SecurityUtils;
@@ -218,9 +219,21 @@ public abstract class IssueSidePanel extends Panel {
Collections.sort(specs);
for (LinkSpec spec: specs) {
- links.add(new LinkSide(spec, false));
- if (spec.getOpposite() != null)
- links.add(new LinkSide(spec, true));
+ if (spec.getOpposite() != null) {
+ IssueQuery query = IssueQuery.parse(getProject(), spec.getOpposite().getIssueQuery(),
+ false, false, false, false, false);
+ if (query.matches(getIssue()))
+ links.add(new LinkSide(spec, false));
+ query = IssueQuery.parse(getProject(), spec.getIssueQuery(), false, false, false,
+ false, false);
+ if (query.matches(getIssue()))
+ links.add(new LinkSide(spec, true));
+ } else {
+ IssueQuery query = IssueQuery.parse(getProject(), spec.getIssueQuery(),
+ false, false, false, false, false);
+ if (query.matches(getIssue()))
+ links.add(new LinkSide(spec, false));
+ }
}
return links;
}
@@ -245,7 +258,8 @@ public abstract class IssueSidePanel extends Panel {
LinkSpec spec = side.spec;
boolean opposite = side.opposite;
- fragment.add(new Label("name", opposite?spec.getOpposite().getName():spec.getName()));
+ String name = opposite?spec.getOpposite().getName():spec.getName();
+ fragment.add(new Label("name", name));
RepeatingView linkedIssuesView = new RepeatingView("linkedIssues");
for (Issue linkedIssue: getIssue().findLinkedIssues(spec, opposite)) {
@@ -263,15 +277,26 @@ public abstract class IssueSidePanel extends Panel {
}
fragment.add(linkedIssuesView);
- IModel<Project> projectModel = new AbstractReadOnlyModel<Project>() {
+ fragment.add(new IssueAddChoice("add", new IssueChoiceProvider() {
@Override
- public Project getObject() {
+ protected Project getProject() {
return getIssue().getProject();
}
- };
- fragment.add(new IssueAddChoice("add", new IssueChoiceProvider(projectModel)) {
+ @Override
+ protected EntityQuery<Issue> getScope() {
+ LinkSpec spec = model.getObject().spec;
+ if (opposite) {
+ return IssueQuery.parse(getProject(), spec.getOpposite().getIssueQuery(),
+ false, false, false, false, false);
+ } else {
+ return IssueQuery.parse(getProject(), spec.getIssueQuery(),
+ false, false, false, false, false);
+ }
+ }
+
+ }) {
@Override
protected void onSelect(AjaxRequestTarget target, Issue selection) {
@@ -283,6 +308,11 @@ public abstract class IssueSidePanel extends Panel {
else
getIssueChangeManager().addLink(spec, getIssue(), selection, opposite);
}
+
+ @Override
+ protected String getPlaceholder() {
+ return "Add " + name.toLowerCase();
+ }
}.setVisible(SecurityUtils.getUser() != null));
@@ -318,6 +348,18 @@ public abstract class IssueSidePanel extends Panel {
return "issueId";
}
+ @Override
+ protected IssueQuery getIssueQuery() {
+ LinkSide side = model.getObject();
+ if (side.opposite) {
+ return IssueQuery.parse(getProject(), side.spec.getOpposite().getIssueQuery(),
+ false, false, false, false, false);
+ } else {
+ return IssueQuery.parse(getProject(), side.spec.getIssueQuery(),
+ false, false, false, false, false);
+ }
+ }
+
@Override
protected void onUpdated(IPartialPageRequestHandler handler, Serializable bean,
String propertyName) {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/comment/CommentInput.java b/server-core/src/main/java/io/onedev/server/web/component/project/comment/CommentInput.java
index 4510d936ba..8436912836 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/comment/CommentInput.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/comment/CommentInput.java
@@ -83,7 +83,7 @@ public abstract class CommentInput extends MarkdownEditor {
if (project == null)
project = getProject();
if (SecurityUtils.canAccess(project))
- return OneDev.getInstance(IssueManager.class).query(project, query, count);
+ return OneDev.getInstance(IssueManager.class).query(null, project, query, count);
else
return new ArrayList<>();
}
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 2f0ec01919..f515ad34be 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
@@ -2,10 +2,13 @@ package io.onedev.server.web.editable;
import java.io.Serializable;
+import javax.annotation.Nullable;
+
import org.apache.wicket.Component;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
+import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.web.component.floating.AlignPlacement;
import io.onedev.server.web.component.floating.FloatingPanel;
import io.onedev.server.web.component.link.DropdownLink;
@@ -42,6 +45,11 @@ public abstract class InplacePropertyEditLink extends DropdownLink {
dropdown.close();
}
+ @Override
+ public IssueQuery getIssueQuery() {
+ return InplacePropertyEditLink.this.getIssueQuery();
+ }
+
};
}
@@ -50,5 +58,10 @@ public abstract class InplacePropertyEditLink extends DropdownLink {
protected abstract String getPropertyName();
protected abstract void onUpdated(IPartialPageRequestHandler handler, Serializable bean, String propertyName);
+
+ @Nullable
+ protected IssueQuery getIssueQuery() {
+ return null;
+ }
}
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 44b486b4b4..0245bf5729 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
@@ -13,9 +13,10 @@ import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.panel.Panel;
import io.onedev.server.util.EditContext;
+import io.onedev.server.web.util.IssueQueryAware;
@SuppressWarnings("serial")
-public abstract class InplacePropertyEditPanel extends Panel implements EditContext {
+public abstract class InplacePropertyEditPanel extends Panel implements EditContext, IssueQueryAware {
private final Serializable bean;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueChoiceEditor.java
index 4e873dae2e..dd057a512c 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueChoiceEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/issue/choice/IssueChoiceEditor.java
@@ -2,7 +2,6 @@ package io.onedev.server.web.editable.issue.choice;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
-import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
@@ -11,10 +10,12 @@ 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.component.issue.choice.IssueChoiceProvider;
+import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.web.component.issue.choice.IssueChoice;
+import io.onedev.server.web.component.issue.choice.IssueChoiceProvider;
import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.PropertyEditor;
+import io.onedev.server.web.util.IssueQueryAware;
import io.onedev.server.web.util.ProjectAware;
@SuppressWarnings("serial")
@@ -45,14 +46,23 @@ public class IssueChoiceEditor extends PropertyEditor<Long> {
else
issue = null;
- IssueChoiceProvider choiceProvider = new IssueChoiceProvider(new AbstractReadOnlyModel<Project>() {
+ IssueChoiceProvider choiceProvider = new IssueChoiceProvider() {
@Override
- public Project getObject() {
- return getProject();
+ protected Project getProject() {
+ return IssueChoiceEditor.this.getProject();
}
-
- });
+
+ @Override
+ protected EntityQuery<Issue> getScope() {
+ IssueQueryAware issueScopeAware = findParent(IssueQueryAware.class);
+ if (issueScopeAware != null)
+ return issueScopeAware.getIssueQuery();
+ else
+ return null;
+ }
+
+ };
input = new IssueChoice("input", Model.of(issue), choiceProvider) {
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java
index 3cfbe09157..651a53400b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java
@@ -113,7 +113,7 @@ abstract class MarkdownBlobEditor extends FormComponentPanel<byte[]> {
if (project == null)
project = context.getProject();
if (SecurityUtils.canAccess(project))
- return OneDev.getInstance(IssueManager.class).query(project, query, count);
+ return OneDev.getInstance(IssueManager.class).query(null, project, query, count);
else
return new ArrayList<>();
}
diff --git a/server-core/src/main/java/io/onedev/server/web/util/IssueQueryAware.java b/server-core/src/main/java/io/onedev/server/web/util/IssueQueryAware.java
new file mode 100644
index 0000000000..070ff85b40
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/util/IssueQueryAware.java
@@ -0,0 +1,12 @@
+package io.onedev.server.web.util;
+
+import javax.annotation.Nullable;
+
+import io.onedev.server.search.entity.issue.IssueQuery;
+
+public interface IssueQueryAware {
+
+ @Nullable
+ IssueQuery getIssueQuery();
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
index a5326b06b2..4a257f93b5 100644
--- a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
+++ b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
@@ -249,7 +249,7 @@ public class SuggestionUtils {
public List<InputSuggestion> suggest(Project project, String matchWith) {
List<InputSuggestion> suggestions = new ArrayList<>();
if (SecurityUtils.canAccess(project)) {
- for (Issue issue: OneDev.getInstance(IssueManager.class).query(project, matchWith, count)) {
+ for (Issue issue: OneDev.getInstance(IssueManager.class).query(null, project, matchWith, count)) {
String title = Emojis.getInstance().apply(issue.getTitle());
suggestions.add(new InputSuggestion("#" + issue.getNumber(), title, null));
}