Skip to content

The Unified and Autonomous Development Platform

Support to choose issue when edit custom issue field

robin shen31e28e7dd41a
diff --git a/core/src/main/java/io/onedev/server/manager/IssueManager.java b/core/src/main/java/io/onedev/server/manager/IssueManager.java
index ae54049372..2582d768d8 100644
--- a/core/src/main/java/io/onedev/server/manager/IssueManager.java
+++ b/core/src/main/java/io/onedev/server/manager/IssueManager.java
@@ -31,4 +31,6 @@ public interface IssueManager extends EntityManager<Issue> {
long count(@Nullable IssueCriteria issueCriteria);
+ List<Issue> query(Project project, @Nullable String term, int count);
+
}
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueFieldManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueFieldManager.java
index 498f54ea7c..edb1654c15 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueFieldManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueFieldManager.java
@@ -15,10 +15,8 @@ import javax.inject.Inject;
import javax.inject.Singleton;
import javax.persistence.Query;
import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaDelete;
import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Expression;
-import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import org.apache.commons.lang.SerializationUtils;
@@ -36,13 +34,14 @@ import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.AbstractEntityManager;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.util.EditContext;
-import io.onedev.server.util.PromptedField;
import io.onedev.server.util.OneContext;
+import io.onedev.server.util.PromptedField;
import io.onedev.server.util.editable.EditableUtils;
import io.onedev.server.util.inputspec.InputContext;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;
import io.onedev.server.util.inputspec.dateinput.DateInput;
+import io.onedev.server.util.inputspec.issuechoiceinput.IssueChoiceInput;
import io.onedev.server.util.inputspec.multichoiceinput.MultiChoiceInput;
import io.onedev.server.util.inputspec.numberinput.NumberInput;
import io.onedev.server.web.editable.BeanDescriptor;
@@ -167,7 +166,9 @@ public class DefaultIssueFieldManager extends AbstractEntityManager<IssueField>
OneContext.pop();
}
} else if (fieldSpec instanceof NumberInput) {
- ordinal = Long.parseLong((String)fieldValue);
+ ordinal = (Integer) fieldValue;
+ } else if (fieldSpec instanceof IssueChoiceInput) {
+ ordinal = (Long) fieldValue;
} else if (fieldSpec instanceof DateInput) {
ordinal = ((Date)fieldValue).getTime();
}
@@ -215,9 +216,8 @@ public class DefaultIssueFieldManager extends AbstractEntityManager<IssueField>
@Transactional
@Override
public void onRenameGroup(String oldName, String newName) {
- Query query = getSession().createQuery("update IssueField set value=:newName where (type=:groupChoice or type=:groupMultiChoice) and value=:oldName");
+ Query query = getSession().createQuery("update IssueField set value=:newName where type=:groupChoice and value=:oldName");
query.setParameter("groupChoice", InputSpec.GROUP_CHOICE);
- query.setParameter("groupMultiChoice", InputSpec.GROUP_MULTI_CHOICE);
query.setParameter("oldName", oldName);
query.setParameter("newName", newName);
query.executeUpdate();
@@ -226,9 +226,8 @@ public class DefaultIssueFieldManager extends AbstractEntityManager<IssueField>
@Transactional
@Override
public void onRenameUser(String oldName, String newName) {
- Query query = getSession().createQuery("update IssueField set value=:newName where (type=:userChoice or type=:userMultiChoice) and value=:oldName");
+ Query query = getSession().createQuery("update IssueField set value=:newName where type=:userChoice and value=:oldName");
query.setParameter("userChoice", InputSpec.USER_CHOICE);
- query.setParameter("userMultiChoice", InputSpec.USER_MULTI_CHOICE);
query.setParameter("oldName", oldName);
query.setParameter("newName", newName);
query.executeUpdate();
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java
index cddbece0ed..2c2a7506a3 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java
@@ -1,6 +1,7 @@
package io.onedev.server.manager.impl;
import java.io.Serializable;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
@@ -15,9 +16,12 @@ import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Join;
import javax.persistence.criteria.Root;
+import org.apache.commons.lang3.StringUtils;
+import org.hibernate.criterion.Order;
import org.hibernate.criterion.Restrictions;
import org.hibernate.query.Query;
+import io.onedev.server.OneDev;
import io.onedev.server.manager.IssueFieldManager;
import io.onedev.server.manager.IssueManager;
import io.onedev.server.model.Issue;
@@ -232,5 +236,46 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements
query.executeUpdate();
}
}
+
+ @Sessional
+ @Override
+ public List<Issue> query(Project project, String term, int count) {
+ List<Issue> issues = new ArrayList<>();
+
+ Long number = null;
+ String numberStr = term;
+ if (numberStr != null) {
+ numberStr = numberStr.trim();
+ if (numberStr.startsWith("#"))
+ numberStr = numberStr.substring(1);
+ if (StringUtils.isNumeric(numberStr))
+ number = Long.valueOf(numberStr);
+ }
+
+ if (number != null) {
+ Issue issue = OneDev.getInstance(IssueManager.class).find(project, number);
+ if (issue != null)
+ issues.add(issue);
+ EntityCriteria<Issue> criteria = EntityCriteria.of(Issue.class);
+ criteria.add(Restrictions.eq("project", project));
+ criteria.add(Restrictions.and(
+ Restrictions.or(Restrictions.ilike("noSpaceTitle", "%" + term + "%"), Restrictions.ilike("numberStr", term + "%")),
+ Restrictions.ne("number", number)
+ ));
+ criteria.addOrder(Order.desc("number"));
+ issues.addAll(OneDev.getInstance(IssueManager.class).findRange(criteria, 0, count-issues.size()));
+ } else {
+ EntityCriteria<Issue> criteria = EntityCriteria.of(Issue.class);
+ criteria.add(Restrictions.eq("project", project));
+ if (StringUtils.isNotBlank(term)) {
+ criteria.add(Restrictions.or(
+ Restrictions.ilike("noSpaceTitle", "%" + term + "%"),
+ Restrictions.ilike("numberStr", (term.startsWith("#")? term.substring(1): term) + "%")));
+ }
+ criteria.addOrder(Order.desc("number"));
+ issues.addAll(OneDev.getInstance(IssueManager.class).findRange(criteria, 0, count));
+ }
+ return issues;
+ }
}
diff --git a/core/src/main/java/io/onedev/server/model/Issue.java b/core/src/main/java/io/onedev/server/model/Issue.java
index 88092daa6d..c07151fcdb 100644
--- a/core/src/main/java/io/onedev/server/model/Issue.java
+++ b/core/src/main/java/io/onedev/server/model/Issue.java
@@ -29,7 +29,6 @@ import org.hibernate.validator.constraints.NotEmpty;
import io.onedev.server.util.PromptedField;
import io.onedev.server.util.editable.annotation.Editable;
import io.onedev.server.util.editable.annotation.Markdown;
-import io.onedev.server.util.facade.IssueFacade;
import io.onedev.server.util.inputspec.InputSpec;
@Entity
@@ -240,10 +239,6 @@ public class Issue extends AbstractEntity {
return promptedFields;
}
- public IssueFacade getFacade() {
- return new IssueFacade(this);
- }
-
public Collection<IssueRelation> getRelationsByCurrent() {
return relationsByCurrent;
}
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/BooleanFieldCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/BooleanFieldCriteria.java
new file mode 100644
index 0000000000..ff7f65c7b8
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/BooleanFieldCriteria.java
@@ -0,0 +1,31 @@
+package io.onedev.server.model.support.issue.query;
+
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+
+import io.onedev.server.model.IssueField;
+
+public class BooleanFieldCriteria extends FieldCriteria {
+
+ private static final long serialVersionUID = 1L;
+
+ private final boolean value;
+
+ private final int operator;
+
+ public BooleanFieldCriteria(String name, boolean value, int operator) {
+ super(name);
+ this.value = value;
+ this.operator = operator;
+ }
+
+ @Override
+ public Predicate getPredicate(QueryBuildContext context) {
+ Path<String> attribute = context.getJoin(getFieldName()).get(IssueField.VALUE);
+ if (operator == IssueQueryLexer.Is)
+ return context.getBuilder().equal(attribute, String.valueOf(value));
+ else
+ return context.getBuilder().notEqual(attribute, String.valueOf(value));
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/FieldUnaryCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/FieldUnaryCriteria.java
index 4df7230d6c..54e60328c1 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/query/FieldUnaryCriteria.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/FieldUnaryCriteria.java
@@ -24,7 +24,7 @@ public class FieldUnaryCriteria extends FieldCriteria {
return context.getBuilder().isNull(attribute);
else if (operator == IssueQueryLexer.IsNotEmpty)
return context.getBuilder().isNotNull(attribute);
- else if (operator == IssueQueryLexer.IsMe || operator == IssueQueryLexer.ContainsMe)
+ else if (operator == IssueQueryLexer.IsMe)
return context.getBuilder().equal(attribute, SecurityUtils.getUser().getName());
else
return context.getBuilder().notEqual(attribute, SecurityUtils.getUser());
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/IssueFieldCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/IssueFieldCriteria.java
new file mode 100644
index 0000000000..8a1d653d56
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/IssueFieldCriteria.java
@@ -0,0 +1,31 @@
+package io.onedev.server.model.support.issue.query;
+
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+
+import io.onedev.server.model.IssueField;
+
+public class IssueFieldCriteria extends FieldCriteria {
+
+ private static final long serialVersionUID = 1L;
+
+ private final int value;
+
+ private final int operator;
+
+ public IssueFieldCriteria(String name, int value, int operator) {
+ super(name);
+ this.value = value;
+ this.operator = operator;
+ }
+
+ @Override
+ public Predicate getPredicate(QueryBuildContext context) {
+ Path<Integer> attribute = context.getJoin(getFieldName()).get(IssueField.ORDINAL);
+ if (operator == IssueQueryLexer.Is)
+ return context.getBuilder().equal(attribute, value);
+ else
+ return context.getBuilder().notEqual(attribute, value);
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQuery.g4 b/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQuery.g4
index f830d980ad..98911d9f0d 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQuery.g4
+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQuery.g4
@@ -9,7 +9,7 @@ query
criteria
: Mine #MineCriteria
- | criteriaField=Quoted WS+ operator=(IsMe|IsNotMe|ContainsMe|DoesNotContainMe|IsEmpty|IsNotEmpty) #UnaryCriteria
+ | criteriaField=Quoted WS+ operator=(IsMe|IsNotMe|IsEmpty|IsNotEmpty) #UnaryCriteria
| criteriaField=Quoted WS+ operator=(Is|IsNot|IsGreaterThan|IsLessThan|IsBefore|IsAfter|Contains|DoesNotContain) WS+ criteriaValue=Quoted #ValueCriteria
| criteria WS+ 'and' WS+ criteria #AndCriteria
| criteria WS+ 'or' WS+ criteria #OrCriteria
@@ -52,14 +52,6 @@ DoesNotContain
: 'does' WS+ 'not' WS+ 'contain'
;
-ContainsMe
- : 'contains' WS+ 'me'
- ;
-
-DoesNotContainMe
- : 'does' WS+ 'not' WS+ 'contain' WS+ 'me'
- ;
-
IsGreaterThan
: 'is' WS+ 'greater' WS+ 'than'
;
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQuery.java b/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQuery.java
index 8ad7eb7c46..d55ec9b342 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQuery.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQuery.java
@@ -48,15 +48,15 @@ import io.onedev.server.util.EditContext;
import io.onedev.server.util.OneContext;
import io.onedev.server.util.inputspec.InputContext;
import io.onedev.server.util.inputspec.InputSpec;
+import io.onedev.server.util.inputspec.booleaninput.BooleanInput;
import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;
import io.onedev.server.util.inputspec.dateinput.DateInput;
import io.onedev.server.util.inputspec.groupchoiceinput.GroupChoiceInput;
-import io.onedev.server.util.inputspec.groupmultichoiceinput.GroupMultiChoiceInput;
+import io.onedev.server.util.inputspec.issuechoiceinput.IssueChoiceInput;
import io.onedev.server.util.inputspec.multichoiceinput.MultiChoiceInput;
import io.onedev.server.util.inputspec.numberinput.NumberInput;
import io.onedev.server.util.inputspec.textinput.TextInput;
import io.onedev.server.util.inputspec.userchoiceinput.UserChoiceInput;
-import io.onedev.server.util.inputspec.usermultichoiceinput.UserMultiChoiceInput;
import io.onedev.utils.WordUtils;
public class IssueQuery implements Serializable {
@@ -133,6 +133,15 @@ public class IssueQuery implements Serializable {
}
}
+ public static boolean getBooleanValue(String value) {
+ if (value.equals("true"))
+ return true;
+ else if (value.equals("false"))
+ return false;
+ else
+ throw new OneException("Invalid boolean: " + value);
+ }
+
public static IssueQuery parse(Project project, @Nullable String queryString) {
if (queryString != null) {
ANTLRInputStream is = new ANTLRInputStream(queryString);
@@ -208,11 +217,7 @@ public class IssueQuery implements Serializable {
IssueCriteria fieldCriteria = new ChoiceFieldCriteria(field.getName(),
SecurityUtils.getUser().getName(), -1, IssueQueryLexer.Is);
fieldCriterias.add(fieldCriteria);
- } else if (field instanceof UserMultiChoiceInput) {
- IssueCriteria fieldCriteria = new MultiChoiceFieldCriteria(field.getName(),
- SecurityUtils.getUser().getName(), IssueQueryLexer.Contains);
- fieldCriterias.add(fieldCriteria);
- }
+ }
}
if (!fieldCriterias.isEmpty()) {
fieldCriterias.add(0, submitterCriteria);
@@ -283,7 +288,14 @@ public class IssueQuery implements Serializable {
return new SubmitterCriteria(user, operator);
} else {
InputSpec field = project.getIssueWorkflow().getField(fieldName);
- if (field instanceof NumberInput) {
+ if (field instanceof IssueChoiceInput) {
+ value = value.trim();
+ if (value.startsWith("#"))
+ value = value.substring(1);
+ return new IssueFieldCriteria(fieldName, getIntValue(value), operator);
+ } else if (field instanceof BooleanInput) {
+ return new BooleanFieldCriteria(fieldName, getBooleanValue(value), operator);
+ } else if (field instanceof NumberInput) {
return new NumberFieldCriteria(fieldName, getIntValue(value), operator);
} else if (field instanceof ChoiceInput) {
long ordinal = getValueOrdinal((ChoiceInput) field, value);
@@ -381,13 +393,6 @@ public class IssueQuery implements Serializable {
else if (SecurityUtils.getUser() == null)
throw new OneException("Please login to perform this query");
break;
- case IssueQueryLexer.ContainsMe:
- case IssueQueryLexer.DoesNotContainMe:
- if (!(field instanceof UserMultiChoiceInput))
- throw newOperatorException(fieldName, operator);
- else if (SecurityUtils.getUser() == null)
- throw new OneException("Please login to perform this query");
- break;
case IssueQueryLexer.IsBefore:
case IssueQueryLexer.IsAfter:
if (!fieldName.equals(Issue.SUBMIT_DATE) && !(field instanceof DateInput))
@@ -398,9 +403,7 @@ public class IssueQuery implements Serializable {
if (!fieldName.equals(Issue.TITLE)
&& !fieldName.equals(Issue.DESCRIPTION)
&& !(field instanceof TextInput)
- && !(field instanceof MultiChoiceInput)
- && !(field instanceof UserMultiChoiceInput)
- && !(field instanceof GroupMultiChoiceInput)) {
+ && !(field instanceof MultiChoiceInput)) {
throw newOperatorException(fieldName, operator);
}
break;
@@ -410,6 +413,8 @@ public class IssueQuery implements Serializable {
&& !fieldName.equals(Issue.VOTES)
&& !fieldName.equals(Issue.SUBMITTER)
&& !fieldName.equals(Issue.NUMBER)
+ && !(field instanceof IssueChoiceInput)
+ && !(field instanceof BooleanInput)
&& !(field instanceof NumberInput)
&& !(field instanceof ChoiceInput)
&& !(field instanceof UserChoiceInput)
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/IssueWorkflow.java b/core/src/main/java/io/onedev/server/model/support/issue/workflow/IssueWorkflow.java
index 1b026b1188..02afaed3af 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/workflow/IssueWorkflow.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/workflow/IssueWorkflow.java
@@ -24,6 +24,9 @@ import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;
import io.onedev.server.util.inputspec.choiceprovider.Choice;
import io.onedev.server.util.inputspec.choiceprovider.SpecifiedChoices;
+import io.onedev.server.util.inputspec.issuechoiceinput.IssueChoiceInput;
+import io.onedev.server.util.inputspec.showcondition.ShowCondition;
+import io.onedev.server.util.inputspec.showcondition.ValueIsOneOf;
import io.onedev.server.util.inputspec.userchoiceinput.UserChoiceInput;
import io.onedev.server.util.inputspec.userchoiceprovider.ProjectReaders;
@@ -102,6 +105,39 @@ public class IssueWorkflow implements Serializable, InputContext {
fields.add(assignee);
+ ChoiceInput resolution = new ChoiceInput();
+ resolution.setName("Resolution");
+ specifiedChoices = new SpecifiedChoices();
+
+ choices = new ArrayList<>();
+
+ Choice fixed = new Choice();
+ fixed.setValue("Fixed");
+ choices.add(fixed);
+
+ Choice wontFix = new Choice();
+ wontFix.setValue("Won't Fix");
+ choices.add(wontFix);
+
+ Choice duplicated = new Choice();
+ duplicated.setValue("Duplicated");
+ choices.add(duplicated);
+
+ specifiedChoices.setChoices(choices);
+ resolution.setChoiceProvider(specifiedChoices);
+
+ fields.add(resolution);
+
+ IssueChoiceInput duplicateIssue = new IssueChoiceInput();
+ duplicateIssue.setName("Duplicate With");
+ ShowCondition showCondition = new ShowCondition();
+ showCondition.setInputName("Resolution");
+ ValueIsOneOf valueIsOneOf = new ValueIsOneOf();
+ valueIsOneOf.setValues(Lists.newArrayList("Duplicated"));
+ showCondition.setValueMatcher(valueIsOneOf);
+ duplicateIssue.setShowCondition(showCondition);
+ fields.add(duplicateIssue);
+
StateSpec open = new StateSpec();
open.setName("Open");
open.setColor("#f1c232");
@@ -119,6 +155,7 @@ public class IssueWorkflow implements Serializable, InputContext {
StateSpec closed = new StateSpec();
closed.setColor("#cccccc");
closed.setName("Closed");
+ closed.setFields(Lists.newArrayList("Resolution", "Duplicate With"));
states.add(closed);
diff --git a/core/src/main/java/io/onedev/server/util/editable/annotation/IssueChoice.java b/core/src/main/java/io/onedev/server/util/editable/annotation/IssueChoice.java
new file mode 100644
index 0000000000..afb24998b4
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/util/editable/annotation/IssueChoice.java
@@ -0,0 +1,11 @@
+package io.onedev.server.util.editable.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface IssueChoice {
+}
diff --git a/core/src/main/java/io/onedev/server/util/facade/IssueFacade.java b/core/src/main/java/io/onedev/server/util/facade/IssueFacade.java
deleted file mode 100644
index ff8ee0f999..0000000000
--- a/core/src/main/java/io/onedev/server/util/facade/IssueFacade.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package io.onedev.server.util.facade;
-
-import io.onedev.server.model.Issue;
-
-public class IssueFacade extends EntityFacade {
-
- private static final long serialVersionUID = 1L;
-
- private final String number;
-
- private final String title;
-
- private final String state;
-
- public IssueFacade(Issue issue) {
- super(issue.getId());
-
- number = String.valueOf(issue.getNumber());
- title = issue.getTitle();
- state = issue.getState();
- }
-
- public String getNumber() {
- return number;
- }
-
- public String getTitle() {
- return title;
- }
-
- public String getState() {
- return state;
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/InputSpec.java b/core/src/main/java/io/onedev/server/util/inputspec/InputSpec.java
index 19df9ba5f3..3b6f4df540 100644
--- a/core/src/main/java/io/onedev/server/util/inputspec/InputSpec.java
+++ b/core/src/main/java/io/onedev/server/util/inputspec/InputSpec.java
@@ -46,11 +46,9 @@ public abstract class InputSpec implements Serializable {
public static final String USER_CHOICE = "User choice";
- public static final String USER_MULTI_CHOICE = "User multi-choice";
-
public static final String GROUP_CHOICE = "Group choice";
- public static final String GROUP_MULTI_CHOICE = "Group multi-choice";
+ public static final String ISSUE_CHOICE = "Issue choice";
private String name;
@@ -146,9 +144,11 @@ public abstract class InputSpec implements Serializable {
buffer.append("\n");
}
- protected void appendAnnotations(StringBuffer buffer, int index,
- String notEmptyAnnotation, @Nullable String choiceAnnotation,
- boolean hasDefaultValueProvider) {
+ protected void appendChoiceProvider(StringBuffer buffer, int index, String annotation) {
+ buffer.append(" " + annotation + "(\"getInput" + index + "Choices\")\n");
+ }
+
+ protected void appendCommonAnnotations(StringBuffer buffer, int index) {
if (description != null) {
buffer.append(" @Editable(name=\"" + escape(name) + "\", description=\"" +
escape(description) + "\", order=" + index + ")\n");
@@ -156,14 +156,12 @@ public abstract class InputSpec implements Serializable {
buffer.append(" @Editable(name=\"" + escape(name) +
"\", order=" + index + ")\n");
}
- if (!allowEmpty)
- buffer.append(" @" + notEmptyAnnotation + "\n");
if (showCondition != null)
buffer.append(" @ShowCondition(\"isInput" + index + "Visible\")\n");
- if (choiceAnnotation != null)
- buffer.append(" @" + choiceAnnotation + "(\"getInput" + index + "Choices\")\n");
- if (hasDefaultValueProvider)
- buffer.append(" @DefaultValueProvider(\"getDefaultInput" + index + "\")\n");
+ }
+
+ protected void appendDefaultValueProvider(StringBuffer buffer, int index) {
+ buffer.append(" @DefaultValueProvider(\"getDefaultInput" + index + "\")\n");
}
protected void appendMethods(StringBuffer buffer, int index, String type,
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/booleaninput/BooleanInput.java b/core/src/main/java/io/onedev/server/util/inputspec/booleaninput/BooleanInput.java
index ca7940946c..501bcd800f 100644
--- a/core/src/main/java/io/onedev/server/util/inputspec/booleaninput/BooleanInput.java
+++ b/core/src/main/java/io/onedev/server/util/inputspec/booleaninput/BooleanInput.java
@@ -46,7 +46,10 @@ public class BooleanInput extends InputSpec {
StringBuffer buffer = new StringBuffer();
appendField(buffer, index, "Boolean");
- appendAnnotations(buffer, index, "NotNull", null, defaultValueProvider!=null);
+ appendCommonAnnotations(buffer, index);
+ buffer.append(" @NotNull\n");
+ if (defaultValueProvider != null)
+ appendDefaultValueProvider(buffer, index);
appendMethods(buffer, index, "Boolean", null, defaultValueProvider);
return buffer.toString();
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/ChoiceInput.java b/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/ChoiceInput.java
index 288465ec80..0ad472e3fc 100644
--- a/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/ChoiceInput.java
+++ b/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/ChoiceInput.java
@@ -59,7 +59,12 @@ public class ChoiceInput extends InputSpec {
int index = indexes.get(getName());
StringBuffer buffer = new StringBuffer();
appendField(buffer, index, "String");
- appendAnnotations(buffer, index, "NotEmpty", "ChoiceProvider", defaultValueProvider!=null);
+ appendCommonAnnotations(buffer, index);
+ if (!isAllowEmpty())
+ buffer.append(" @NotEmpty\n");
+ appendChoiceProvider(buffer, index, "@ChoiceProvider");
+ if (defaultValueProvider != null)
+ appendDefaultValueProvider(buffer, index);
appendMethods(buffer, index, "String", choiceProvider, defaultValueProvider);
return buffer.toString();
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/dateinput/DateInput.java b/core/src/main/java/io/onedev/server/util/inputspec/dateinput/DateInput.java
index 4506ee10e5..1499d69ac7 100644
--- a/core/src/main/java/io/onedev/server/util/inputspec/dateinput/DateInput.java
+++ b/core/src/main/java/io/onedev/server/util/inputspec/dateinput/DateInput.java
@@ -35,7 +35,11 @@ public class DateInput extends InputSpec {
int index = indexes.get(getName());
StringBuffer buffer = new StringBuffer();
appendField(buffer, index, "Date");
- appendAnnotations(buffer, index, "NotNull", null, defaultValueProvider!=null);
+ appendCommonAnnotations(buffer, index);
+ if (!isAllowEmpty())
+ buffer.append(" @NotNull\n");
+ if (defaultValueProvider != null)
+ appendDefaultValueProvider(buffer, index);
appendMethods(buffer, index, "Date", null, defaultValueProvider);
return buffer.toString();
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/GroupChoiceInput.java b/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/GroupChoiceInput.java
index 830c29fcde..21563b1bac 100644
--- a/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/GroupChoiceInput.java
+++ b/core/src/main/java/io/onedev/server/util/inputspec/groupchoiceinput/GroupChoiceInput.java
@@ -62,7 +62,12 @@ public class GroupChoiceInput extends InputSpec {
int index = indexes.get(getName());
StringBuffer buffer = new StringBuffer();
appendField(buffer, index, "String");
- appendAnnotations(buffer, index, "NotEmpty", "GroupChoice", defaultValueProvider!=null);
+ appendCommonAnnotations(buffer, index);
+ if (!isAllowEmpty())
+ buffer.append(" @NotEmpty\n");
+ appendChoiceProvider(buffer, index, "@GroupChoice");
+ if (defaultValueProvider != null)
+ appendDefaultValueProvider(buffer, index);
appendMethods(buffer, index, "String", choiceProvider, defaultValueProvider);
return buffer.toString();
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/groupmultichoiceinput/GroupMultiChoiceInput.java b/core/src/main/java/io/onedev/server/util/inputspec/groupmultichoiceinput/GroupMultiChoiceInput.java
deleted file mode 100644
index 0e6e9ad3a3..0000000000
--- a/core/src/main/java/io/onedev/server/util/inputspec/groupmultichoiceinput/GroupMultiChoiceInput.java
+++ /dev/null
@@ -1,88 +0,0 @@
-package io.onedev.server.util.inputspec.groupmultichoiceinput;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.validation.constraints.NotNull;
-
-import io.onedev.server.util.editable.annotation.Editable;
-import io.onedev.server.util.editable.annotation.NameOfEmptyValue;
-import io.onedev.server.util.inputspec.InputSpec;
-import io.onedev.server.util.inputspec.groupchoiceprovider.AllGroups;
-import io.onedev.server.util.inputspec.groupchoiceprovider.ChoiceProvider;
-import io.onedev.server.util.inputspec.groupmultichoiceinput.defaultvalueprovider.DefaultValueProvider;
-import io.onedev.server.util.inputspec.groupmultichoiceinput.defaultvalueprovider.SpecifiedDefaultValue;
-
-@Editable(order=161, name=InputSpec.GROUP_MULTI_CHOICE)
-public class GroupMultiChoiceInput extends InputSpec {
-
- private static final long serialVersionUID = 1L;
-
- private ChoiceProvider choiceProvider = new AllGroups();
-
- private DefaultValueProvider defaultValueProvider;
-
- @Editable(order=1000, name="Available Choices")
- @NotNull(message="may not be empty")
- public ChoiceProvider getChoiceProvider() {
- return choiceProvider;
- }
-
- public void setChoiceProvider(ChoiceProvider choiceProvider) {
- this.choiceProvider = choiceProvider;
- }
-
- @Editable(order=1100, name="Default Value")
- @NameOfEmptyValue("No default value")
- public DefaultValueProvider getDefaultValueProvider() {
- return defaultValueProvider;
- }
-
- public void setDefaultValueProvider(DefaultValueProvider defaultValueProvider) {
- this.defaultValueProvider = defaultValueProvider;
- }
-
- @Override
- public String getPropertyDef(Map<String, Integer> indexes) {
- int index = indexes.get(getName());
- StringBuffer buffer = new StringBuffer();
- appendField(buffer, index, "List<String>");
- appendAnnotations(buffer, index, "Size(min=1, max=100)", "GroupChoice", defaultValueProvider!=null);
- appendMethods(buffer, index, "List<String>", choiceProvider, defaultValueProvider);
-
- return buffer.toString();
- }
-
- @Override
- public void onRenameGroup(String oldName, String newName) {
- if (defaultValueProvider instanceof SpecifiedDefaultValue) {
- SpecifiedDefaultValue specifiedDefaultValue = (SpecifiedDefaultValue) defaultValueProvider;
- int index = specifiedDefaultValue.getValue().indexOf(oldName);
- if (index != -1)
- specifiedDefaultValue.getValue().set(index, newName);
- }
- }
-
- @Override
- public List<String> onDeleteGroup(String groupName) {
- List<String> usages = super.onDeleteGroup(groupName);
- if (defaultValueProvider instanceof SpecifiedDefaultValue) {
- SpecifiedDefaultValue specifiedDefaultValue = (SpecifiedDefaultValue) defaultValueProvider;
- if (specifiedDefaultValue.getValue().contains(groupName))
- usages.add("Default Value");
- }
- return usages;
- }
-
- @Override
- public Object convertToObject(List<String> strings) {
- return strings;
- }
-
- @SuppressWarnings("unchecked")
- @Override
- public List<String> convertToStrings(Object value) {
- return (List<String>)value;
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/groupmultichoiceinput/defaultvalueprovider/DefaultValueProvider.java b/core/src/main/java/io/onedev/server/util/inputspec/groupmultichoiceinput/defaultvalueprovider/DefaultValueProvider.java
deleted file mode 100644
index cf01538057..0000000000
--- a/core/src/main/java/io/onedev/server/util/inputspec/groupmultichoiceinput/defaultvalueprovider/DefaultValueProvider.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.util.inputspec.groupmultichoiceinput.defaultvalueprovider;
-
-import java.io.Serializable;
-import java.util.List;
-
-import io.onedev.server.util.editable.annotation.Editable;
-
-@Editable
-public interface DefaultValueProvider extends Serializable {
-
- List<String> getDefaultValue();
-
-}
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/groupmultichoiceinput/defaultvalueprovider/ScriptingDefaultValue.java b/core/src/main/java/io/onedev/server/util/inputspec/groupmultichoiceinput/defaultvalueprovider/ScriptingDefaultValue.java
deleted file mode 100644
index 7c5ebdd089..0000000000
--- a/core/src/main/java/io/onedev/server/util/inputspec/groupmultichoiceinput/defaultvalueprovider/ScriptingDefaultValue.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package io.onedev.server.util.inputspec.groupmultichoiceinput.defaultvalueprovider;
-
-import java.util.List;
-
-import org.hibernate.validator.constraints.NotEmpty;
-
-import io.onedev.server.util.GroovyUtils;
-import io.onedev.server.util.editable.annotation.Editable;
-import io.onedev.server.util.editable.annotation.Multiline;
-import io.onedev.server.util.editable.annotation.OmitName;
-import io.onedev.server.util.editable.annotation.Script;
-
-@Editable(order=400, name="Evaluate script to get default value")
-public class ScriptingDefaultValue implements DefaultValueProvider {
-
- private static final long serialVersionUID = 1L;
-
- private String script;
-
- @Editable(description="Groovy script to be evaluated. It should return list of group name. "
- + "Check <a href='$onedev.docLink/scripting.md' target='_blank'>scripting help</a> for details")
- @NotEmpty
- @Script
- @OmitName
- @Multiline
- public String getScript() {
- return script;
- }
-
- public void setScript(String script) {
- this.script = script;
- }
-
- @SuppressWarnings("unchecked")
- @Override
- public List<String> getDefaultValue() {
- return (List<String>) GroovyUtils.evalScript(getScript());
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/groupmultichoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java b/core/src/main/java/io/onedev/server/util/inputspec/groupmultichoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java
deleted file mode 100644
index 6b15f12310..0000000000
--- a/core/src/main/java/io/onedev/server/util/inputspec/groupmultichoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package io.onedev.server.util.inputspec.groupmultichoiceinput.defaultvalueprovider;
-
-import java.util.List;
-
-import javax.validation.Validator;
-
-import org.hibernate.validator.constraints.NotEmpty;
-
-import com.google.common.collect.Lists;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.util.OneContext;
-import io.onedev.server.util.editable.annotation.Editable;
-import io.onedev.server.util.editable.annotation.GroupChoice;
-import io.onedev.server.util.editable.annotation.OmitName;
-import io.onedev.server.util.facade.GroupFacade;
-import io.onedev.server.util.inputspec.groupchoiceprovider.ChoiceProvider;
-
-@Editable(order=100, name="Specified default value")
-public class SpecifiedDefaultValue implements DefaultValueProvider {
-
- private static final long serialVersionUID = 1L;
-
- private List<String> value;
-
- @Editable(name="Literal default value")
- @GroupChoice("getValueChoices")
- @NotEmpty
- @OmitName
- public List<String> getValue() {
- return value;
- }
-
- public void setValue(List<String> value) {
- this.value = value;
- }
-
- @Override
- public List<String> getDefaultValue() {
- return getValue();
- }
-
- @SuppressWarnings("unused")
- private static List<GroupFacade> getValueChoices() {
- ChoiceProvider choiceProvider = (ChoiceProvider) OneContext.get().getEditContext(1).getInputValue("choiceProvider");
- if (choiceProvider != null && OneDev.getInstance(Validator.class).validate(choiceProvider).isEmpty())
- return choiceProvider.getChoices(true);
- else
- return Lists.newArrayList();
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/issuechoiceinput/IssueChoiceInput.java b/core/src/main/java/io/onedev/server/util/inputspec/issuechoiceinput/IssueChoiceInput.java
new file mode 100644
index 0000000000..878e295e28
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/util/inputspec/issuechoiceinput/IssueChoiceInput.java
@@ -0,0 +1,39 @@
+package io.onedev.server.util.inputspec.issuechoiceinput;
+
+import java.util.List;
+import java.util.Map;
+
+import io.onedev.server.util.editable.annotation.Editable;
+import io.onedev.server.util.inputspec.InputSpec;
+import jersey.repackaged.com.google.common.collect.Lists;
+
+@Editable(order=160, name=InputSpec.ISSUE_CHOICE)
+public class IssueChoiceInput extends InputSpec {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public String getPropertyDef(Map<String, Integer> indexes) {
+ int index = indexes.get(getName());
+ StringBuffer buffer = new StringBuffer();
+ appendField(buffer, index, "Long");
+ appendCommonAnnotations(buffer, index);
+ if (!isAllowEmpty())
+ buffer.append(" @NotNull\n");
+ buffer.append(" @IssueChoice\n");
+ appendMethods(buffer, index, "Long", null, null);
+
+ return buffer.toString();
+ }
+
+ @Override
+ public Object convertToObject(List<String> strings) {
+ return Long.valueOf(strings.iterator().next());
+ }
+
+ @Override
+ public List<String> convertToStrings(Object value) {
+ return Lists.newArrayList(value.toString());
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/multichoiceinput/MultiChoiceInput.java b/core/src/main/java/io/onedev/server/util/inputspec/multichoiceinput/MultiChoiceInput.java
index 40b7c40232..bdbd17e585 100644
--- a/core/src/main/java/io/onedev/server/util/inputspec/multichoiceinput/MultiChoiceInput.java
+++ b/core/src/main/java/io/onedev/server/util/inputspec/multichoiceinput/MultiChoiceInput.java
@@ -46,7 +46,12 @@ public class MultiChoiceInput extends InputSpec {
int index = indexes.get(getName());
StringBuffer buffer = new StringBuffer();
appendField(buffer, index, "List<String>");
- appendAnnotations(buffer, index, "Size(min=1, max=100)", "ChoiceProvider", defaultValueProvider!=null);
+ appendCommonAnnotations(buffer, index);
+ if (!isAllowEmpty())
+ buffer.append(" @Size(min=1, max=100)\n");
+ appendChoiceProvider(buffer, index, "@ChoiceProvider");
+ if (defaultValueProvider != null)
+ appendDefaultValueProvider(buffer, index);
appendMethods(buffer, index, "List<String>", choiceProvider, defaultValueProvider);
return buffer.toString();
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/numberinput/NumberInput.java b/core/src/main/java/io/onedev/server/util/inputspec/numberinput/NumberInput.java
index b6741e89bd..be840f3dfc 100644
--- a/core/src/main/java/io/onedev/server/util/inputspec/numberinput/NumberInput.java
+++ b/core/src/main/java/io/onedev/server/util/inputspec/numberinput/NumberInput.java
@@ -54,7 +54,11 @@ public class NumberInput extends InputSpec {
int index = indexes.get(getName());
StringBuffer buffer = new StringBuffer();
appendField(buffer, index, "Integer");
- appendAnnotations(buffer, index, "NotNull", null, defaultValueProvider!=null);
+ appendCommonAnnotations(buffer, index);
+ if (!isAllowEmpty())
+ buffer.append(" @NotNull\n");
+ if (defaultValueProvider != null)
+ appendDefaultValueProvider(buffer, index);
if (minValue != null) {
if (maxValue != null) {
buffer.append(" @Range(min=" + minValue.toString() + "L,max=" + maxValue.toString() +"L)\n");
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/passwordinput/PasswordInput.java b/core/src/main/java/io/onedev/server/util/inputspec/passwordinput/PasswordInput.java
index bebf734062..1ead11047d 100644
--- a/core/src/main/java/io/onedev/server/util/inputspec/passwordinput/PasswordInput.java
+++ b/core/src/main/java/io/onedev/server/util/inputspec/passwordinput/PasswordInput.java
@@ -31,7 +31,11 @@ public class PasswordInput extends InputSpec {
int index = indexes.get(getName());
StringBuffer buffer = new StringBuffer();
appendField(buffer, index, "String");
- appendAnnotations(buffer, index, "NotEmpty", null, defaultValueProvider!=null);
+ appendCommonAnnotations(buffer, index);
+ if (!isAllowEmpty())
+ buffer.append(" @NotEmpty\n");
+ if (defaultValueProvider != null)
+ appendDefaultValueProvider(buffer, index);
buffer.append(" @Password\n");
appendMethods(buffer, index, "String", null, defaultValueProvider);
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/textinput/TextInput.java b/core/src/main/java/io/onedev/server/util/inputspec/textinput/TextInput.java
index faff700123..92f9da80b2 100644
--- a/core/src/main/java/io/onedev/server/util/inputspec/textinput/TextInput.java
+++ b/core/src/main/java/io/onedev/server/util/inputspec/textinput/TextInput.java
@@ -54,7 +54,11 @@ public class TextInput extends InputSpec {
int index = indexes.get(getName());
StringBuffer buffer = new StringBuffer();
appendField(buffer, index, "String");
- appendAnnotations(buffer, index, "NotEmpty", null, defaultValueProvider!=null);
+ appendCommonAnnotations(buffer, index);
+ if (!isAllowEmpty())
+ buffer.append(" @NotEmpty\n");
+ if (defaultValueProvider != null)
+ appendDefaultValueProvider(buffer, index);
if (isMultiline())
buffer.append(" @Multiline\n");
if (getPattern() != null)
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/UserChoiceInput.java b/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/UserChoiceInput.java
index b36eac80ba..521b39c3cd 100644
--- a/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/UserChoiceInput.java
+++ b/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/UserChoiceInput.java
@@ -63,7 +63,12 @@ public class UserChoiceInput extends InputSpec {
int index = indexes.get(getName());
StringBuffer buffer = new StringBuffer();
appendField(buffer, index, "String");
- appendAnnotations(buffer, index, "NotEmpty", "UserChoice", defaultValueProvider!=null);
+ appendCommonAnnotations(buffer, index);
+ if (!isAllowEmpty())
+ buffer.append(" @NotEmpty\n");
+ appendChoiceProvider(buffer, index, "@UserChoice");
+ if (defaultValueProvider != null)
+ appendDefaultValueProvider(buffer, index);
appendMethods(buffer, index, "String", choiceProvider, defaultValueProvider);
return buffer.toString();
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/usermultichoiceinput/UserMultiChoiceInput.java b/core/src/main/java/io/onedev/server/util/inputspec/usermultichoiceinput/UserMultiChoiceInput.java
deleted file mode 100644
index 4479b7d463..0000000000
--- a/core/src/main/java/io/onedev/server/util/inputspec/usermultichoiceinput/UserMultiChoiceInput.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package io.onedev.server.util.inputspec.usermultichoiceinput;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.validation.constraints.NotNull;
-
-import io.onedev.server.util.editable.annotation.Editable;
-import io.onedev.server.util.editable.annotation.NameOfEmptyValue;
-import io.onedev.server.util.inputspec.InputSpec;
-import io.onedev.server.util.inputspec.userchoiceprovider.ChoiceProvider;
-import io.onedev.server.util.inputspec.userchoiceprovider.GroupUsers;
-import io.onedev.server.util.inputspec.userchoiceprovider.ProjectReaders;
-import io.onedev.server.util.inputspec.usermultichoiceinput.defaultvalueprovider.DefaultValueProvider;
-import io.onedev.server.util.inputspec.usermultichoiceinput.defaultvalueprovider.SpecifiedDefaultValue;
-
-@Editable(order=151, name=InputSpec.USER_MULTI_CHOICE)
-public class UserMultiChoiceInput extends InputSpec {
-
- private static final long serialVersionUID = 1L;
-
- private ChoiceProvider choiceProvider = new ProjectReaders();
-
- private DefaultValueProvider defaultValueProvider;
-
- @Editable(order=1000, name="Available Choices")
- @NotNull(message="may not be empty")
- public ChoiceProvider getChoiceProvider() {
- return choiceProvider;
- }
-
- public void setChoiceProvider(ChoiceProvider choiceProvider) {
- this.choiceProvider = choiceProvider;
- }
-
- @Editable(order=1100, name="Default Value")
- @NameOfEmptyValue("No default value")
- public DefaultValueProvider getDefaultValueProvider() {
- return defaultValueProvider;
- }
-
- public void setDefaultValueProvider(DefaultValueProvider defaultValueProvider) {
- this.defaultValueProvider = defaultValueProvider;
- }
-
- @Override
- public String getPropertyDef(Map<String, Integer> indexes) {
- int index = indexes.get(getName());
- StringBuffer buffer = new StringBuffer();
- appendField(buffer, index, "List<String>");
- appendAnnotations(buffer, index, "Size(min=1, max=100)", "UserChoice", defaultValueProvider!=null);
- appendMethods(buffer, index, "List<String>", choiceProvider, defaultValueProvider);
-
- return buffer.toString();
- }
-
- @Override
- public void onRenameUser(String oldName, String newName) {
- if (defaultValueProvider instanceof SpecifiedDefaultValue) {
- SpecifiedDefaultValue specifiedDefaultValue = (SpecifiedDefaultValue) defaultValueProvider;
- int index = specifiedDefaultValue.getValue().indexOf(oldName);
- if (index != -1)
- specifiedDefaultValue.getValue().set(index, newName);
- }
- }
-
- @Override
- public List<String> onDeleteUser(String userName) {
- List<String> usages = super.onDeleteUser(userName);
- if (defaultValueProvider instanceof SpecifiedDefaultValue) {
- SpecifiedDefaultValue specifiedDefaultValue = (SpecifiedDefaultValue) defaultValueProvider;
- if (specifiedDefaultValue.getValue().contains(userName))
- usages.add("Default Value");
- }
- return usages;
- }
-
- @Override
- public void onRenameGroup(String oldName, String newName) {
- if (choiceProvider instanceof GroupUsers) {
- GroupUsers groupUsers = (GroupUsers) choiceProvider;
- if (groupUsers.getGroupName().equals(oldName))
- groupUsers.setGroupName(newName);
- }
- }
-
- @Override
- public List<String> onDeleteGroup(String groupName) {
- List<String> usages = super.onDeleteGroup(groupName);
- if (choiceProvider instanceof GroupUsers) {
- GroupUsers groupUsers = (GroupUsers) choiceProvider;
- if (groupUsers.getGroupName().equals(groupName))
- usages.add("Available Choices");
- }
- return usages;
- }
-
- @Override
- public Object convertToObject(List<String> strings) {
- return strings;
- }
-
- @SuppressWarnings("unchecked")
- @Override
- public List<String> convertToStrings(Object value) {
- return (List<String>) value;
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/usermultichoiceinput/defaultvalueprovider/DefaultValueProvider.java b/core/src/main/java/io/onedev/server/util/inputspec/usermultichoiceinput/defaultvalueprovider/DefaultValueProvider.java
deleted file mode 100644
index d528c49fb9..0000000000
--- a/core/src/main/java/io/onedev/server/util/inputspec/usermultichoiceinput/defaultvalueprovider/DefaultValueProvider.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.util.inputspec.usermultichoiceinput.defaultvalueprovider;
-
-import java.io.Serializable;
-import java.util.List;
-
-import io.onedev.server.util.editable.annotation.Editable;
-
-@Editable
-public interface DefaultValueProvider extends Serializable {
-
- List<String> getDefaultValue();
-
-}
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/usermultichoiceinput/defaultvalueprovider/ScriptingDefaultValue.java b/core/src/main/java/io/onedev/server/util/inputspec/usermultichoiceinput/defaultvalueprovider/ScriptingDefaultValue.java
deleted file mode 100644
index 41aa25f9fc..0000000000
--- a/core/src/main/java/io/onedev/server/util/inputspec/usermultichoiceinput/defaultvalueprovider/ScriptingDefaultValue.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package io.onedev.server.util.inputspec.usermultichoiceinput.defaultvalueprovider;
-
-import java.util.List;
-
-import org.hibernate.validator.constraints.NotEmpty;
-
-import io.onedev.server.util.GroovyUtils;
-import io.onedev.server.util.editable.annotation.Editable;
-import io.onedev.server.util.editable.annotation.Multiline;
-import io.onedev.server.util.editable.annotation.OmitName;
-import io.onedev.server.util.editable.annotation.Script;
-
-@Editable(order=400, name="Evaluate script to get default value")
-public class ScriptingDefaultValue implements DefaultValueProvider {
-
- private static final long serialVersionUID = 1L;
-
- private String script;
-
- @Editable(description="Groovy script to be evaluated. It should return list of user login name. "
- + "Check <a href='$onedev.docLink/scripting.md' target='_blank'>scripting help</a> for details")
- @NotEmpty
- @Script
- @OmitName
- @Multiline
- public String getScript() {
- return script;
- }
-
- public void setScript(String script) {
- this.script = script;
- }
-
- @SuppressWarnings("unchecked")
- @Override
- public List<String> getDefaultValue() {
- return (List<String>) GroovyUtils.evalScript(getScript());
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/usermultichoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java b/core/src/main/java/io/onedev/server/util/inputspec/usermultichoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java
deleted file mode 100644
index c742e7554b..0000000000
--- a/core/src/main/java/io/onedev/server/util/inputspec/usermultichoiceinput/defaultvalueprovider/SpecifiedDefaultValue.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package io.onedev.server.util.inputspec.usermultichoiceinput.defaultvalueprovider;
-
-import java.util.List;
-
-import javax.validation.Validator;
-
-import org.hibernate.validator.constraints.NotEmpty;
-
-import com.google.common.collect.Lists;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.util.OneContext;
-import io.onedev.server.util.editable.annotation.Editable;
-import io.onedev.server.util.editable.annotation.OmitName;
-import io.onedev.server.util.editable.annotation.UserChoice;
-import io.onedev.server.util.facade.UserFacade;
-import io.onedev.server.util.inputspec.userchoiceprovider.ChoiceProvider;
-
-@Editable(order=100, name="Specified default value")
-public class SpecifiedDefaultValue implements DefaultValueProvider {
-
- private static final long serialVersionUID = 1L;
-
- private List<String> value;
-
- @Editable(name="Literal default value")
- @UserChoice("getValueChoices")
- @NotEmpty
- @OmitName
- public List<String> getValue() {
- return value;
- }
-
- public void setValue(List<String> value) {
- this.value = value;
- }
-
- @Override
- public List<String> getDefaultValue() {
- return getValue();
- }
-
- @SuppressWarnings("unused")
- private static List<UserFacade> getValueChoices() {
- ChoiceProvider choiceProvider = (ChoiceProvider) OneContext.get().getEditContext(1).getInputValue("choiceProvider");
- if (choiceProvider != null && OneDev.getInstance(Validator.class).validate(choiceProvider).isEmpty())
- return choiceProvider.getChoices(true);
- else
- return Lists.newArrayList();
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/web/component/issuechoice/IssueChoiceProvider.java b/core/src/main/java/io/onedev/server/web/component/issuechoice/IssueChoiceProvider.java
index 51ee2f2473..fc4e791491 100644
--- a/core/src/main/java/io/onedev/server/web/component/issuechoice/IssueChoiceProvider.java
+++ b/core/src/main/java/io/onedev/server/web/component/issuechoice/IssueChoiceProvider.java
@@ -1,13 +1,9 @@
package io.onedev.server.web.component.issuechoice;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.model.IModel;
-import org.hibernate.criterion.Order;
-import org.hibernate.criterion.Restrictions;
import org.json.JSONException;
import org.json.JSONWriter;
import org.unbescape.html.HtmlEscape;
@@ -18,7 +14,6 @@ import io.onedev.server.OneDev;
import io.onedev.server.manager.IssueManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
-import io.onedev.server.persistence.dao.EntityCriteria;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.component.select2.ChoiceProvider;
import io.onedev.server.web.component.select2.Response;
@@ -59,34 +54,8 @@ public class IssueChoiceProvider extends ChoiceProvider<Issue> {
@Override
public void query(String term, int page, Response<Issue> response) {
int count = (page+1) * WebConstants.PAGE_SIZE;
-
Project project = projectModel.getObject();
- List<Issue> issues = new ArrayList<>();
- if (StringUtils.isNumeric(term)) {
- long number = Long.parseLong(term);
- Issue issue = OneDev.getInstance(IssueManager.class).find(project, number);
- if (issue != null)
- issues.add(issue);
- EntityCriteria<Issue> criteria = EntityCriteria.of(Issue.class);
- criteria.add(Restrictions.eq("project", project));
- criteria.add(Restrictions.and(
- Restrictions.or(Restrictions.ilike("title", "%" + term + "%"), Restrictions.ilike("numberStr", term + "%")),
- Restrictions.ne("number", number)
- ));
- criteria.addOrder(Order.desc("number"));
- issues.addAll(OneDev.getInstance(IssueManager.class).findRange(criteria, 0, count-issues.size()));
- } else {
- EntityCriteria<Issue> criteria = EntityCriteria.of(Issue.class);
- criteria.add(Restrictions.eq("project", project));
- if (StringUtils.isNotBlank(term)) {
- criteria.add(Restrictions.or(
- Restrictions.ilike("title", "%" + term + "%"),
- Restrictions.ilike("numberStr", term + "%")));
- }
- criteria.addOrder(Order.desc("number"));
- issues.addAll(OneDev.getInstance(IssueManager.class).findRange(criteria, 0, count));
- }
-
+ List<Issue> issues = OneDev.getInstance(IssueManager.class).query(project, term, count);
new ResponseFiller<>(response).fill(issues, page, WebConstants.PAGE_SIZE);
}
diff --git a/core/src/main/java/io/onedev/server/web/component/issuechoice/issue-choice.js b/core/src/main/java/io/onedev/server/web/component/issuechoice/issue-choice.js
index 9e3d0c7ffc..22b0e154f9 100644
--- a/core/src/main/java/io/onedev/server/web/component/issuechoice/issue-choice.js
+++ b/core/src/main/java/io/onedev/server/web/component/issuechoice/issue-choice.js
@@ -1,6 +1,6 @@
onedev.server.issueChoiceFormatter = {
formatSelection: function(issue) {
- return issue.number;
+ return "#" + issue.number + " - " + issue.title;
},
formatResult: function(issue) {
diff --git a/core/src/main/java/io/onedev/server/web/component/stringchoice/StringChoiceProvider.java b/core/src/main/java/io/onedev/server/web/component/stringchoice/StringChoiceProvider.java
index 2a2c61af51..53de4cadb1 100644
--- a/core/src/main/java/io/onedev/server/web/component/stringchoice/StringChoiceProvider.java
+++ b/core/src/main/java/io/onedev/server/web/component/stringchoice/StringChoiceProvider.java
@@ -42,7 +42,7 @@ public class StringChoiceProvider extends ChoiceProvider<String> {
public void query(String term, int page, Response<String> response) {
List<String> matched;
if (StringUtils.isNotBlank(term)) {
- matched = new ArrayList<>(values);
+ matched = new ArrayList<>();
for (String each: values) {
if (each.toLowerCase().startsWith(term))
matched.add(each);
diff --git a/core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.html b/core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.html
index f1c90cbe9e..a62a3bcf51 100644
--- a/core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.html
+++ b/core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.html
@@ -1,3 +1,3 @@
<wicket:panel>
- <input wicket:id="input" type="hidden"></input>
+ <input wicket:id="input" type="hidden" class="form-control"></input>
</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java
index 6bec50bbaa..19d24729a5 100644
--- a/core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java
@@ -5,6 +5,9 @@ import java.util.List;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.html.form.DropDownChoice;
+import org.apache.wicket.markup.html.form.FormComponent;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
@@ -12,7 +15,6 @@ import org.apache.wicket.util.convert.ConversionException;
import com.google.common.base.Preconditions;
import io.onedev.server.util.OneContext;
-import io.onedev.server.web.component.select2.Select2Choice;
import io.onedev.server.web.component.stringchoice.StringSingleChoice;
import io.onedev.server.web.editable.ErrorContext;
import io.onedev.server.web.editable.PathSegment;
@@ -24,9 +26,11 @@ import io.onedev.utils.ReflectionUtils;
@SuppressWarnings("serial")
public class SingleChoiceEditor extends PropertyEditor<String> {
+ private static final int SELECT2_THRESHOLD = 10;
+
private List<String> choices = new ArrayList<>();
- private Select2Choice<String> input;
+ private FormComponent<String> input;
public SingleChoiceEditor(String id, PropertyDescriptor propertyDescriptor, IModel<String> propertyModel) {
super(id, propertyDescriptor, propertyModel);
@@ -52,8 +56,21 @@ public class SingleChoiceEditor extends PropertyEditor<String> {
} finally {
OneContext.pop();
}
-
- input = new StringSingleChoice("input", Model.of(getModelObject()), choices);
+
+ if (choices.size() > SELECT2_THRESHOLD) {
+ input = new StringSingleChoice("input", Model.of(getModelObject()), choices);
+ } else {
+ input = new DropDownChoice<String>("input", Model.of(getModelObject()), choices) {
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ tag.setName("select");
+ tag.remove("type");
+ super.onComponentTag(tag);
+ }
+
+ };
+ }
input.setLabel(Model.of(getPropertyDescriptor().getDisplayName(this)));
input.add(new AjaxFormComponentUpdatingBehavior("change"){
diff --git a/core/src/main/java/io/onedev/server/web/editable/issuechoice/IssueChoiceEditor.html b/core/src/main/java/io/onedev/server/web/editable/issuechoice/IssueChoiceEditor.html
new file mode 100644
index 0000000000..f1c90cbe9e
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/editable/issuechoice/IssueChoiceEditor.html
@@ -0,0 +1,3 @@
+<wicket:panel>
+ <input wicket:id="input" type="hidden"></input>
+</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/editable/issuechoice/IssueChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/issuechoice/IssueChoiceEditor.java
new file mode 100644
index 0000000000..b130355c8c
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/editable/issuechoice/IssueChoiceEditor.java
@@ -0,0 +1,86 @@
+package io.onedev.server.web.editable.issuechoice;
+
+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;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.manager.IssueManager;
+import io.onedev.server.model.Issue;
+import io.onedev.server.model.Project;
+import io.onedev.server.web.component.issuechoice.IssueChoiceProvider;
+import io.onedev.server.web.component.issuechoice.IssueSingleChoice;
+import io.onedev.server.web.editable.ErrorContext;
+import io.onedev.server.web.editable.PathSegment;
+import io.onedev.server.web.editable.PropertyDescriptor;
+import io.onedev.server.web.editable.PropertyEditor;
+import io.onedev.server.web.page.project.ProjectPage;
+
+@SuppressWarnings("serial")
+public class IssueChoiceEditor extends PropertyEditor<Long> {
+
+ private IssueSingleChoice input;
+
+ public IssueChoiceEditor(String id, PropertyDescriptor propertyDescriptor,
+ IModel<Long> propertyModel) {
+ super(id, propertyDescriptor, propertyModel);
+ }
+
+ private Project getProject() {
+ return ((ProjectPage)getPage()).getProject();
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ Issue issue;
+ if (getModelObject() != null)
+ issue = OneDev.getInstance(IssueManager.class).find(getProject(), getModelObject());
+ else
+ issue = null;
+
+ IssueChoiceProvider choiceProvider = new IssueChoiceProvider(new AbstractReadOnlyModel<Project>() {
+
+ @Override
+ public Project getObject() {
+ return getProject();
+ }
+
+ });
+ input = new IssueSingleChoice("input", Model.of(issue), choiceProvider);
+ input.setConvertEmptyInputStringToNull(true);
+
+ // add this to control allowClear flag of select2
+ input.setRequired(propertyDescriptor.isPropertyRequired());
+ input.setLabel(Model.of(getPropertyDescriptor().getDisplayName(this)));
+
+ input.add(new AjaxFormComponentUpdatingBehavior("change"){
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ onPropertyUpdating(target);
+ }
+
+ });
+ add(input);
+ }
+
+ @Override
+ public ErrorContext getErrorContext(PathSegment pathSegment) {
+ return null;
+ }
+
+ @Override
+ protected Long convertInputToValue() throws ConversionException {
+ Issue issue = input.getConvertedInput();
+ if (issue != null)
+ return issue.getNumber();
+ else
+ return null;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/editable/issuechoice/IssueEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/issuechoice/IssueEditSupport.java
new file mode 100644
index 0000000000..72fe505860
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/editable/issuechoice/IssueEditSupport.java
@@ -0,0 +1,59 @@
+package io.onedev.server.web.editable.issuechoice;
+
+import java.lang.reflect.Method;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.model.IModel;
+
+import io.onedev.server.util.editable.annotation.IssueChoice;
+import io.onedev.server.web.editable.EditSupport;
+import io.onedev.server.web.editable.EmptyValueLabel;
+import io.onedev.server.web.editable.PropertyContext;
+import io.onedev.server.web.editable.PropertyDescriptor;
+import io.onedev.server.web.editable.PropertyEditor;
+import io.onedev.server.web.editable.PropertyViewer;
+
+@SuppressWarnings("serial")
+public class IssueEditSupport implements EditSupport {
+
+ @Override
+ public PropertyContext<?> getEditContext(Class<?> beanClass, String propertyName) {
+ PropertyDescriptor propertyDescriptor = new PropertyDescriptor(beanClass, propertyName);
+ Method propertyGetter = propertyDescriptor.getPropertyGetter();
+ IssueChoice issueChoice = propertyGetter.getAnnotation(IssueChoice.class);
+ if (issueChoice != null) {
+ if (propertyGetter.getReturnType() == Long.class) {
+ return new PropertyContext<Long>(propertyDescriptor) {
+
+ @Override
+ public PropertyViewer renderForView(String componentId, final IModel<Long> model) {
+ return new PropertyViewer(componentId, this) {
+
+ @Override
+ protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {
+ if (model.getObject() != null) {
+ return new Label(id, "#" + model.getObject());
+ } else {
+ return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());
+ }
+ }
+
+ };
+ }
+
+ @Override
+ public PropertyEditor<Long> renderForEdit(String componentId, IModel<Long> model) {
+ return new IssueChoiceEditor(componentId, this, model);
+ }
+
+ };
+ } else {
+ throw new RuntimeException("Annotation 'IssueChoice' should be applied to property with type 'Long'.");
+ }
+ } else {
+ return null;
+ }
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/editable/numeric/NumericEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/numeric/NumericEditSupport.java
index 04544b7488..10e0df2131 100644
--- a/core/src/main/java/io/onedev/server/web/editable/numeric/NumericEditSupport.java
+++ b/core/src/main/java/io/onedev/server/web/editable/numeric/NumericEditSupport.java
@@ -1,9 +1,12 @@
package io.onedev.server.web.editable.numeric;
+import java.lang.reflect.Method;
+
import org.apache.wicket.Component;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
+import io.onedev.server.util.editable.annotation.IssueChoice;
import io.onedev.server.web.editable.EditSupport;
import io.onedev.server.web.editable.EmptyValueLabel;
import io.onedev.server.web.editable.PropertyContext;
@@ -18,9 +21,11 @@ public class NumericEditSupport implements EditSupport {
public PropertyContext<?> getEditContext(Class<?> beanClass, String propertyName) {
PropertyDescriptor propertyDescriptor = new PropertyDescriptor(beanClass, propertyName);
- Class<?> propertyClass = propertyDescriptor.getPropertyGetter().getReturnType();
- if (propertyClass == int.class || propertyClass == long.class
- || propertyClass == Integer.class || propertyClass == Long.class) {
+ Method propertyGetter = propertyDescriptor.getPropertyGetter();
+ Class<?> propertyClass = propertyGetter.getReturnType();
+ if ((propertyClass == int.class || propertyClass == long.class
+ || propertyClass == Integer.class || propertyClass == Long.class)
+ && propertyGetter.getAnnotation(IssueChoice.class) == null) {
return new PropertyContext<Number>(propertyDescriptor) {
@Override
diff --git a/core/src/main/java/io/onedev/server/web/editable/string/StringEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/string/StringEditSupport.java
index a918ae5e81..8989635612 100644
--- a/core/src/main/java/io/onedev/server/web/editable/string/StringEditSupport.java
+++ b/core/src/main/java/io/onedev/server/web/editable/string/StringEditSupport.java
@@ -7,13 +7,13 @@ import org.apache.wicket.model.IModel;
import io.onedev.server.util.editable.annotation.BranchPattern;
import io.onedev.server.util.editable.annotation.ChoiceProvider;
import io.onedev.server.util.editable.annotation.Color;
-import io.onedev.server.util.editable.annotation.Script;
import io.onedev.server.util.editable.annotation.GroupChoice;
import io.onedev.server.util.editable.annotation.Markdown;
import io.onedev.server.util.editable.annotation.Multiline;
import io.onedev.server.util.editable.annotation.Password;
import io.onedev.server.util.editable.annotation.PathPattern;
import io.onedev.server.util.editable.annotation.ReviewRequirementSpec;
+import io.onedev.server.util.editable.annotation.Script;
import io.onedev.server.util.editable.annotation.TagPattern;
import io.onedev.server.util.editable.annotation.UserChoice;
import io.onedev.server.web.component.MultilineLabel;
diff --git a/core/src/main/java/io/onedev/server/web/page/base/base.css b/core/src/main/java/io/onedev/server/web/page/base/base.css
index 8908146494..20bd005d13 100644
--- a/core/src/main/java/io/onedev/server/web/page/base/base.css
+++ b/core/src/main/java/io/onedev/server/web/page/base/base.css
@@ -397,9 +397,6 @@ a.fa {
table {
width: 100%;
}
-table>tbody>tr>td {
- vertical-align: top;
-}
table.table>thead>tr>th>a {
color: black;
text-decoration: underline;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.html b/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.html
index d69ed71cee..10b2c8affd 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.html
@@ -1,7 +1,7 @@
<wicket:extend>
<div id="repo-commits">
<div class="head">
- <form wicket:id="query" class="query">
+ <form wicket:id="query" class="query no-autofocus">
<div class="input-group">
<input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control" placeholder="Filter by branch, tag, commit id, file path, date, user or commit message"></input>
<span class="input-group-btn">
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/fieldvalues/FieldValuesPanel.html b/core/src/main/java/io/onedev/server/web/page/project/issues/fieldvalues/FieldValuesPanel.html
index 5315690fcf..1d7b007b29 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/fieldvalues/FieldValuesPanel.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/fieldvalues/FieldValuesPanel.html
@@ -3,6 +3,11 @@
<wicket:fragment wicket:id="userFrag">
<a wicket:id="name"></a>
</wicket:fragment>
+ <wicket:fragment wicket:id="issueFrag">
+ <div class="issue">
+ <a wicket:id="link"><span wicket:id="label"></span></a> <span wicket:id="state" class="label state"></span>
+ </div>
+ </wicket:fragment>
<wicket:fragment wicket:id="nonEmptyValuesFrag">
<div wicket:id="values" class="value"><div wicket:id="value"></div></div>
</wicket:fragment>
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/fieldvalues/FieldValuesPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/fieldvalues/FieldValuesPanel.java
index 024690d6e6..b12579b624 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/fieldvalues/FieldValuesPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/fieldvalues/FieldValuesPanel.java
@@ -1,26 +1,37 @@
package io.onedev.server.web.page.project.issues.fieldvalues;
import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.link.Link;
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.IModel;
+import org.apache.wicket.model.Model;
import org.unbescape.html.HtmlEscape;
import io.onedev.server.OneDev;
+import io.onedev.server.manager.IssueManager;
import io.onedev.server.manager.UserManager;
+import io.onedev.server.model.Issue;
+import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.util.EditContext;
-import io.onedev.server.util.PromptedField;
import io.onedev.server.util.OneContext;
+import io.onedev.server.util.PromptedField;
import io.onedev.server.util.editable.EditableUtils;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;
import io.onedev.server.util.inputspec.choiceprovider.ChoiceProvider;
import io.onedev.server.util.inputspec.multichoiceinput.MultiChoiceInput;
+import io.onedev.server.web.component.IssueStateLabel;
import io.onedev.server.web.component.link.UserLink;
+import io.onedev.server.web.page.project.ProjectPage;
+import io.onedev.server.web.page.project.issues.issuedetail.IssueDetailPage;
import io.onedev.server.web.util.ComponentContext;
import io.onedev.utils.ColorUtils;
@@ -35,18 +46,32 @@ public class FieldValuesPanel extends GenericPanel<PromptedField> implements Edi
protected void onInitialize() {
super.onInitialize();
+ Project project = ((ProjectPage) getPage()).getProject();
+
if (getField() != null && !getField().getValues().isEmpty()) {
UserManager userManager = OneDev.getInstance(UserManager.class);
+ IssueManager issueManager = OneDev.getInstance(IssueManager.class);
Fragment fragment = new Fragment("values", "nonEmptyValuesFrag", this);
RepeatingView valuesView = new RepeatingView("values");
for (String value: getField().getValues()) {
WebMarkupContainer item = new WebMarkupContainer(valuesView.newChildId());
- if (getField().getType().equals(InputSpec.USER_CHOICE)
- || getField().getType().equals(InputSpec.USER_MULTI_CHOICE)) {
+ if (getField().getType().equals(InputSpec.USER_CHOICE)) {
User user = User.getForDisplay(userManager.findByName(value), value);
Fragment userFrag = new Fragment("value", "userFrag", this);
userFrag.add(new UserLink("name", user));
item.add(userFrag);
+ } else if (getField().getType().equals(InputSpec.ISSUE_CHOICE)) {
+ Issue issue = issueManager.find(project, Long.valueOf(value));
+ if (issue != null) {
+ Fragment issueFrag = new Fragment("value", "issueFrag", this);
+ Link<Void> link = new BookmarkablePageLink<Void>("link", IssueDetailPage.class, IssueDetailPage.paramsOf(issue));
+ link.add(new Label("label", "#" + issue.getNumber()));
+ issueFrag.add(link);
+ issueFrag.add(new IssueStateLabel("state", Model.of(issue)));
+ item.add(issueFrag);
+ } else {
+ item.add(new Label("value", "#" + value));
+ }
} else {
Label label = new Label("value", value);
InputSpec fieldSpec = getField().getIssue().getProject().getIssueWorkflow().getField(getField().getName());
@@ -107,5 +132,11 @@ public class FieldValuesPanel extends GenericPanel<PromptedField> implements Edi
private PromptedField getField() {
return getModelObject();
}
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(CssHeaderItem.forReference(new FieldValuesResourceReference()));
+ }
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/fieldvalues/FieldValuesResourceReference.java b/core/src/main/java/io/onedev/server/web/page/project/issues/fieldvalues/FieldValuesResourceReference.java
new file mode 100644
index 0000000000..ef64ad7f78
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/fieldvalues/FieldValuesResourceReference.java
@@ -0,0 +1,13 @@
+package io.onedev.server.web.page.project.issues.fieldvalues;
+
+import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
+
+public class FieldValuesResourceReference extends BaseDependentCssResourceReference {
+
+ private static final long serialVersionUID = 1L;
+
+ public FieldValuesResourceReference() {
+ super(FieldValuesResourceReference.class, "field-values.css");
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/fieldvalues/field-values.css b/core/src/main/java/io/onedev/server/web/page/project/issues/fieldvalues/field-values.css
new file mode 100644
index 0000000000..b0c5a36f7e
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/fieldvalues/field-values.css
@@ -0,0 +1,3 @@
+.field-values .issue a {
+ margin-right: 4px;
+}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/issue-detail.css b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/issue-detail.css
index 079d1b290a..05f111085e 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/issue-detail.css
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/issue-detail.css
@@ -50,10 +50,10 @@
white-space: nowrap;
padding-right: 20px;
}
-#issue-detail>.additional .fields .values .value div {
+#issue-detail>.additional .fields .values .value>div {
display: table-cell;
border-radius: 3px;
- padding: 3px 6px;
+ padding: 3px 6px 3px 0;
}
#issue-detail>.additional .relations label {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueQueryBehavior.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueQueryBehavior.java
index 6bc6c12e01..338505fa2c 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueQueryBehavior.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueQueryBehavior.java
@@ -23,6 +23,7 @@ import io.onedev.codeassist.parser.Element;
import io.onedev.server.OneDev;
import io.onedev.server.exception.OneException;
import io.onedev.server.manager.GroupManager;
+import io.onedev.server.manager.IssueManager;
import io.onedev.server.manager.UserManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
@@ -35,16 +36,17 @@ import io.onedev.server.util.EditContext;
import io.onedev.server.util.OneContext;
import io.onedev.server.util.inputspec.InputContext;
import io.onedev.server.util.inputspec.InputSpec;
+import io.onedev.server.util.inputspec.booleaninput.BooleanInput;
import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;
import io.onedev.server.util.inputspec.dateinput.DateInput;
import io.onedev.server.util.inputspec.groupchoiceinput.GroupChoiceInput;
-import io.onedev.server.util.inputspec.groupmultichoiceinput.GroupMultiChoiceInput;
+import io.onedev.server.util.inputspec.issuechoiceinput.IssueChoiceInput;
import io.onedev.server.util.inputspec.multichoiceinput.MultiChoiceInput;
import io.onedev.server.util.inputspec.numberinput.NumberInput;
import io.onedev.server.util.inputspec.textinput.TextInput;
import io.onedev.server.util.inputspec.userchoiceinput.UserChoiceInput;
-import io.onedev.server.util.inputspec.usermultichoiceinput.UserMultiChoiceInput;
import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;
+import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;
import io.onedev.utils.Range;
@SuppressWarnings("serial")
@@ -61,6 +63,8 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
"yesterday midnight", "3 days ago", "last week", "last Monday",
"4 weeks ago", "1 month 2 days ago", "1 year ago");
+ private static final int MAX_ISSUE_TITLE_LEN = 75;
+
public IssueQueryBehavior(IModel<Project> projectModel) {
super(IssueQueryParser.class, "query");
this.projectModel = projectModel;
@@ -126,9 +130,9 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
candidates.add(Constants.DATE_FORMATTER.print(System.currentTimeMillis()));
suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith));
CollectionUtils.addIgnoreNull(suggestions, suggestToFence(unfencedMatchWith));
- } else if (fieldName.equals(Issue.SUBMITTER) || field instanceof UserChoiceInput || field instanceof UserMultiChoiceInput) {
+ } else if (fieldName.equals(Issue.SUBMITTER) || field instanceof UserChoiceInput) {
for (User user: OneDev.getInstance(UserManager.class).findAll()) {
- Range match = Range.matchStart(user.getName(), unfencedLowerCaseMatchWith, false, true);
+ Range match = Range.match(user.getName(), unfencedLowerCaseMatchWith, true, false, true);
if (match != null) {
String description;
if (!user.getDisplayName().equals(user.getName()))
@@ -138,7 +142,15 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
suggestions.add(new InputSuggestion(user.getName(), description, match));
}
}
- } else if (field instanceof GroupChoiceInput || field instanceof GroupMultiChoiceInput) {
+ } else if (field instanceof IssueChoiceInput) {
+ List<Issue> issues = OneDev.getInstance(IssueManager.class).query(project, unfencedLowerCaseMatchWith, InputAssistBehavior.MAX_SUGGESTIONS);
+ for (Issue issue: issues) {
+ InputSuggestion suggestion = new InputSuggestion("#" + issue.getNumber(), StringUtils.abbreviate(issue.getTitle(), MAX_ISSUE_TITLE_LEN), null);
+ suggestions.add(suggestion);
+ }
+ } else if (field instanceof BooleanInput) {
+ suggestions.addAll(getSuggestions(Lists.newArrayList("true", "false"), unfencedLowerCaseMatchWith));
+ } else if (field instanceof GroupChoiceInput) {
List<String> candidates = OneDev.getInstance(GroupManager.class).findAll().stream().map(it->it.getName()).collect(Collectors.toList());
suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith));
} else if (fieldName.equals(Issue.STATE)) {
@@ -167,7 +179,6 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
}
} catch (OneException ex) {
}
-
}
return suggestions;
}