The Unified and Autonomous Development Platform
fix issue #20: Support multiple users for custom field of user type
Robin Shenc699279df616
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/UserChoiceParam.java b/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/UserChoiceParam.javaindex b8112a9b2f..83436ef1dd 100755--- a/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/UserChoiceParam.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/UserChoiceParam.java@@ -9,12 +9,15 @@ import javax.validation.constraints.NotNull;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.util.EditContext;import io.onedev.server.util.inputspec.userchoiceinput.UserChoiceInput;import io.onedev.server.util.inputspec.userchoiceinput.choiceprovider.AllUsers;import io.onedev.server.util.inputspec.userchoiceinput.choiceprovider.ChoiceProvider;+import io.onedev.server.util.inputspec.userchoiceinput.defaultmultivalueprovider.DefaultMultiValueProvider;import io.onedev.server.util.inputspec.userchoiceinput.defaultvalueprovider.DefaultValueProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;+import io.onedev.server.web.editable.annotation.ShowCondition;@Editable(order=150, name=ParamSpec.USER)public class UserChoiceParam extends ParamSpec {@@ -25,6 +28,8 @@ public class UserChoiceParam extends ParamSpec {private DefaultValueProvider defaultValueProvider;+ private DefaultMultiValueProvider defaultMultiValueProvider;+@Editable(order=1000, name="Available Choices")@NotNull(message="may not be empty")@Valid@@ -37,6 +42,7 @@ public class UserChoiceParam extends ParamSpec {}@Editable(order=1100, name="Default Value")+ @ShowCondition("isDefaultValueProviderVisible")@NameOfEmptyValue("No default value")@Validpublic DefaultValueProvider getDefaultValueProvider() {@@ -47,6 +53,28 @@ public class UserChoiceParam extends ParamSpec {this.defaultValueProvider = defaultValueProvider;}+ @SuppressWarnings("unused")+ private static boolean isDefaultValueProviderVisible() {+ return EditContext.get().getInputValue("allowMultiple").equals(false);+ }++ @ShowCondition("isDefaultMultiValueProviderVisible")+ @Editable(order=1100, name="Default Value")+ @NameOfEmptyValue("No default value")+ @Valid+ public DefaultMultiValueProvider getDefaultMultiValueProvider() {+ return defaultMultiValueProvider;+ }++ public void setDefaultMultiValueProvider(DefaultMultiValueProvider defaultMultiValueProvider) {+ this.defaultMultiValueProvider = defaultMultiValueProvider;+ }++ @SuppressWarnings("unused")+ private static boolean isDefaultMultiValueProviderVisible() {+ return EditContext.get().getInputValue("allowMultiple").equals(true);+ }+@Overridepublic List<String> getPossibleValues() {return OneDev.getInstance(UserManager.class).query().stream().map(user->user.getName()).collect(Collectors.toList());@@ -54,23 +82,17 @@ public class UserChoiceParam extends ParamSpec {@Overridepublic String getPropertyDef(Map<String, Integer> indexes) {- return UserChoiceInput.getPropertyDef(this, indexes, choiceProvider, defaultValueProvider);- }-- @Editable- @Override- public boolean isAllowMultiple() {- return false;+ return UserChoiceInput.getPropertyDef(this, indexes, choiceProvider, defaultValueProvider, defaultMultiValueProvider);}@Overridepublic Object convertToObject(List<String> strings) {- return UserChoiceInput.convertToObject(strings);+ return UserChoiceInput.convertToObject(this, strings);}@Overridepublic List<String> convertToStrings(Object value) {- return UserChoiceInput.convertToStrings(value);+ return UserChoiceInput.convertToStrings(this, value);}}diff --git a/server-core/src/main/java/io/onedev/server/event/issue/IssueChangeEvent.java b/server-core/src/main/java/io/onedev/server/event/issue/IssueChangeEvent.javaindex 6e1a5a8e50..9e60e31046 100644--- a/server-core/src/main/java/io/onedev/server/event/issue/IssueChangeEvent.java+++ b/server-core/src/main/java/io/onedev/server/event/issue/IssueChangeEvent.java@@ -1,5 +1,6 @@package io.onedev.server.event.issue;+import java.util.Collection;import java.util.Map;import io.onedev.server.event.MarkdownAware;@@ -34,7 +35,7 @@ public class IssueChangeEvent extends IssueEvent implements MarkdownAware {}@Override- public Map<String, User> getNewUsers() {+ public Map<String, Collection<User>> getNewUsers() {return change.getData().getNewUsers();}diff --git a/server-core/src/main/java/io/onedev/server/event/issue/IssueEvent.java b/server-core/src/main/java/io/onedev/server/event/issue/IssueEvent.javaindex b7d0f0cbae..713e88151d 100644--- a/server-core/src/main/java/io/onedev/server/event/issue/IssueEvent.java+++ b/server-core/src/main/java/io/onedev/server/event/issue/IssueEvent.java@@ -1,5 +1,6 @@package io.onedev.server.event.issue;+import java.util.Collection;import java.util.Date;import java.util.HashMap;import java.util.Map;@@ -24,7 +25,7 @@ public abstract class IssueEvent extends ProjectEvent {public abstract boolean affectsBoards();- public Map<String, User> getNewUsers() {+ public Map<String, Collection<User>> getNewUsers() {return new HashMap<>();}diff --git a/server-core/src/main/java/io/onedev/server/event/issue/IssueOpened.java b/server-core/src/main/java/io/onedev/server/event/issue/IssueOpened.javaindex 86b0ed7ad8..b96a54675c 100644--- a/server-core/src/main/java/io/onedev/server/event/issue/IssueOpened.java+++ b/server-core/src/main/java/io/onedev/server/event/issue/IssueOpened.java@@ -1,7 +1,10 @@package io.onedev.server.event.issue;+import java.util.Collection;import java.util.HashMap;import java.util.Map;+import java.util.Set;+import java.util.stream.Collectors;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.GroupManager;@@ -30,16 +33,18 @@ public class IssueOpened extends IssueEvent implements MarkdownAware {}@Override- public Map<String, User> getNewUsers() {- Map<String, User> newUsers = new HashMap<>();+ public Map<String, Collection<User>> getNewUsers() {+ Map<String, Collection<User>> newUsers = new HashMap<>();UserManager userManager = OneDev.getInstance(UserManager.class);for (Input field: getIssue().getFieldInputs().values()) {if (field.getType().equals(FieldSpec.USER)) {- if (!field.getValues().isEmpty()) {- User newUser = userManager.findByName(field.getValues().iterator().next());- if (newUser != null)- newUsers.put(field.getName(), newUser);- }+ Set<User> usersOfField = field.getValues()+ .stream()+ .map(it->userManager.findByName(it))+ .filter(it->it!=null)+ .collect(Collectors.toSet());+ if (!usersOfField.isEmpty())+ newUsers.put(field.getName(), usersOfField);}}return newUsers;diff --git a/server-core/src/main/java/io/onedev/server/issue/fieldspec/UserChoiceField.java b/server-core/src/main/java/io/onedev/server/issue/fieldspec/UserChoiceField.javaindex e0df821c27..9c10a4319f 100644--- a/server-core/src/main/java/io/onedev/server/issue/fieldspec/UserChoiceField.java+++ b/server-core/src/main/java/io/onedev/server/issue/fieldspec/UserChoiceField.java@@ -9,14 +9,17 @@ import javax.validation.constraints.NotNull;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.util.EditContext;import io.onedev.server.util.Usage;import io.onedev.server.util.inputspec.userchoiceinput.UserChoiceInput;import io.onedev.server.util.inputspec.userchoiceinput.choiceprovider.AllUsers;import io.onedev.server.util.inputspec.userchoiceinput.choiceprovider.ChoiceProvider;+import io.onedev.server.util.inputspec.userchoiceinput.defaultmultivalueprovider.DefaultMultiValueProvider;import io.onedev.server.util.inputspec.userchoiceinput.defaultvalueprovider.DefaultValueProvider;import io.onedev.server.util.inputspec.userchoiceinput.defaultvalueprovider.SpecifiedDefaultValue;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;+import io.onedev.server.web.editable.annotation.ShowCondition;@Editable(order=150, name=FieldSpec.USER)public class UserChoiceField extends FieldSpec {@@ -27,6 +30,8 @@ public class UserChoiceField extends FieldSpec {private DefaultValueProvider defaultValueProvider;+ private DefaultMultiValueProvider defaultMultiValueProvider;+@Editable(order=1000, name="Available Choices")@NotNull(message="may not be empty")@Valid@@ -39,6 +44,7 @@ public class UserChoiceField extends FieldSpec {}@Editable(order=1100, name="Default Value")+ @ShowCondition("isDefaultValueProviderVisible")@NameOfEmptyValue("No default value")@Validpublic DefaultValueProvider getDefaultValueProvider() {@@ -49,6 +55,28 @@ public class UserChoiceField extends FieldSpec {this.defaultValueProvider = defaultValueProvider;}+ @SuppressWarnings("unused")+ private static boolean isDefaultValueProviderVisible() {+ return EditContext.get().getInputValue("allowMultiple").equals(false);+ }++ @ShowCondition("isDefaultMultiValueProviderVisible")+ @Editable(order=1100, name="Default Value")+ @NameOfEmptyValue("No default value")+ @Valid+ public DefaultMultiValueProvider getDefaultMultiValueProvider() {+ return defaultMultiValueProvider;+ }++ public void setDefaultMultiValueProvider(DefaultMultiValueProvider defaultMultiValueProvider) {+ this.defaultMultiValueProvider = defaultMultiValueProvider;+ }++ @SuppressWarnings("unused")+ private static boolean isDefaultMultiValueProviderVisible() {+ return EditContext.get().getInputValue("allowMultiple").equals(true);+ }+@Overridepublic List<String> getPossibleValues() {return OneDev.getInstance(UserManager.class).query().stream().map(user->user.getName()).collect(Collectors.toList());@@ -56,13 +84,7 @@ public class UserChoiceField extends FieldSpec {@Overridepublic String getPropertyDef(Map<String, Integer> indexes) {- return UserChoiceInput.getPropertyDef(this, indexes, choiceProvider, defaultValueProvider);- }-- @Editable- @Override- public boolean isAllowMultiple() {- return false;+ return UserChoiceInput.getPropertyDef(this, indexes, choiceProvider, defaultValueProvider, defaultMultiValueProvider);}public void onRenameUser(DefaultValueProvider defaultValueProvider, String oldName, String newName) {@@ -84,12 +106,12 @@ public class UserChoiceField extends FieldSpec {@Overridepublic Object convertToObject(List<String> strings) {- return UserChoiceInput.convertToObject(strings);+ return UserChoiceInput.convertToObject(this, strings);}@Overridepublic List<String> convertToStrings(Object value) {- return UserChoiceInput.convertToStrings(value);+ return UserChoiceInput.convertToStrings(this, value);}}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueChangeData.javaindex e0aa8a9a5f..29c88bcf0f 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueChangeData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueChangeData.java@@ -1,6 +1,7 @@package io.onedev.server.model.support.issue.changedata;import java.io.Serializable;+import java.util.Collection;import java.util.Map;import javax.annotation.Nullable;@@ -21,7 +22,7 @@ public interface IssueChangeData extends Serializable {@NullableCommentSupport getCommentSupport();- Map<String, User> getNewUsers();+ Map<String, Collection<User>> getNewUsers();Map<String, Group> getNewGroups();diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueCommittedData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueCommittedData.javaindex d235e07377..175583b0a4 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueCommittedData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueCommittedData.java@@ -1,5 +1,6 @@package io.onedev.server.model.support.issue.changedata;+import java.util.Collection;import java.util.HashMap;import java.util.Map;@@ -50,7 +51,7 @@ public class IssueCommittedData implements IssueChangeData {}@Override- public Map<String, User> getNewUsers() {+ public Map<String, Collection<User>> getNewUsers() {return new HashMap<>();}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueDescriptionChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueDescriptionChangeData.javaindex f47a8d92c5..caf225d198 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueDescriptionChangeData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueDescriptionChangeData.java@@ -1,5 +1,6 @@package io.onedev.server.model.support.issue.changedata;+import java.util.Collection;import java.util.HashMap;import java.util.List;import java.util.Map;@@ -44,7 +45,7 @@ public class IssueDescriptionChangeData implements IssueChangeData {}@Override- public Map<String, User> getNewUsers() {+ public Map<String, Collection<User>> getNewUsers() {return new HashMap<>();}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueFieldChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueFieldChangeData.javaindex 7409863aeb..bbaff95c3b 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueFieldChangeData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueFieldChangeData.java@@ -1,10 +1,13 @@package io.onedev.server.model.support.issue.changedata;import java.util.ArrayList;+import java.util.Collection;import java.util.HashMap;import java.util.LinkedHashMap;import java.util.List;import java.util.Map;+import java.util.Set;+import java.util.stream.Collectors;import org.apache.wicket.Component;@@ -102,29 +105,38 @@ public class IssueFieldChangeData implements IssueChangeData {}@Override- public Map<String, User> getNewUsers() {+ public Map<String, Collection<User>> getNewUsers() {UserManager userManager = OneDev.getInstance(UserManager.class);- Map<String, User> newUsers = new HashMap<>();+ Map<String, Collection<User>> newUsers = new HashMap<>();for (Input oldField: oldFields.values()) {Input newField = newFields.get(oldField.getName());- if (newField != null && !describe(oldField).equals(describe(newField))- && newField.getType().equals(FieldSpec.USER) && !newField.getValues().isEmpty()) {- User user = userManager.findByName(newField.getValues().iterator().next());- if (user != null)- newUsers.put(newField.getName(), user);+ if (newField != null+ && !describe(oldField).equals(describe(newField))+ && newField.getType().equals(FieldSpec.USER)) {+ Set<User> newUsersOfField = newField.getValues()+ .stream()+ .filter(it->!oldField.getValues().contains(it))+ .map(it->userManager.findByName(it))+ .filter(it->it!=null)+ .collect(Collectors.toSet());+ if (!newUsersOfField.isEmpty())+ newUsers.put(newField.getName(), newUsersOfField);}}for (Input newField: newFields.values()) {- if (!oldFields.containsKey(newField.getName()) && newField.getType().equals(FieldSpec.USER)- && !newField.getValues().isEmpty()) {- User user = userManager.findByName(newField.getValues().iterator().next());- if (user != null)- newUsers.put(newField.getName(), user);+ if (!oldFields.containsKey(newField.getName())+ && newField.getType().equals(FieldSpec.USER)) {+ Set<User> usersOfField = newField.getValues()+ .stream()+ .map(it->userManager.findByName(it))+ .filter(it->it!=null)+ .collect(Collectors.toSet());+ if (!usersOfField.isEmpty())+ newUsers.put(newField.getName(), usersOfField);}}return newUsers;}-@Overridepublic Map<String, Group> getNewGroups() {diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueMilestoneChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueMilestoneChangeData.javaindex c8ecf0b147..b9205ce5da 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueMilestoneChangeData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueMilestoneChangeData.java@@ -1,6 +1,7 @@package io.onedev.server.model.support.issue.changedata;import java.util.ArrayList;+import java.util.Collection;import java.util.HashMap;import java.util.List;import java.util.Map;@@ -71,7 +72,7 @@ public class IssueMilestoneChangeData implements IssueChangeData {}@Override- public Map<String, User> getNewUsers() {+ public Map<String, Collection<User>> getNewUsers() {return new HashMap<>();}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssuePullRequestData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssuePullRequestData.javaindex 2190d83199..b6053be273 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssuePullRequestData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssuePullRequestData.java@@ -1,5 +1,6 @@package io.onedev.server.model.support.issue.changedata;+import java.util.Collection;import java.util.HashMap;import java.util.Map;@@ -42,7 +43,7 @@ public abstract class IssuePullRequestData implements IssueChangeData {}@Override- public Map<String, User> getNewUsers() {+ public Map<String, Collection<User>> getNewUsers() {return new HashMap<>();}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromCodeCommentData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromCodeCommentData.javaindex b787828c98..09d551418d 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromCodeCommentData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromCodeCommentData.java@@ -1,5 +1,6 @@package io.onedev.server.model.support.issue.changedata;+import java.util.Collection;import java.util.HashMap;import java.util.Map;@@ -42,7 +43,7 @@ public class IssueReferencedFromCodeCommentData implements IssueChangeData {}@Override- public Map<String, User> getNewUsers() {+ public Map<String, Collection<User>> getNewUsers() {return new HashMap<>();}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromIssueData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromIssueData.javaindex d12d2e2d4d..0d729b0cc0 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromIssueData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromIssueData.java@@ -1,5 +1,6 @@package io.onedev.server.model.support.issue.changedata;+import java.util.Collection;import java.util.HashMap;import java.util.Map;@@ -42,7 +43,7 @@ public class IssueReferencedFromIssueData implements IssueChangeData {}@Override- public Map<String, User> getNewUsers() {+ public Map<String, Collection<User>> getNewUsers() {return new HashMap<>();}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromPullRequestData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromPullRequestData.javaindex f5ebcbcc02..a269148fac 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromPullRequestData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromPullRequestData.java@@ -1,5 +1,6 @@package io.onedev.server.model.support.issue.changedata;+import java.util.Collection;import java.util.HashMap;import java.util.Map;@@ -42,7 +43,7 @@ public class IssueReferencedFromPullRequestData implements IssueChangeData {}@Override- public Map<String, User> getNewUsers() {+ public Map<String, Collection<User>> getNewUsers() {return new HashMap<>();}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueTitleChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueTitleChangeData.javaindex c9c3df1e9e..be8779f2f2 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueTitleChangeData.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueTitleChangeData.java@@ -1,5 +1,6 @@package io.onedev.server.model.support.issue.changedata;+import java.util.Collection;import java.util.HashMap;import java.util.Map;@@ -42,7 +43,7 @@ public class IssueTitleChangeData implements IssueChangeData {}@Override- public Map<String, User> getNewUsers() {+ public Map<String, Collection<User>> getNewUsers() {return new HashMap<>();}diff --git a/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.javaindex 060c6e4704..b22b792ade 100644--- a/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java@@ -4,13 +4,12 @@ import java.util.Collection;import java.util.Date;import java.util.HashSet;import java.util.Map;+import java.util.Set;import java.util.stream.Collectors;import javax.inject.Inject;import javax.inject.Singleton;-import com.google.common.collect.Lists;-import io.onedev.commons.launcher.loader.Listen;import io.onedev.server.entitymanager.IssueWatchManager;import io.onedev.server.entitymanager.SettingManager;@@ -166,19 +165,20 @@ public class IssueNotificationManager {}Map<String, Group> newGroups = event.getNewGroups();- Map<String, User> newUsers = event.getNewUsers();+ Map<String, Collection<User>> newUsers = event.getNewUsers();for (Group group: newGroups.values()) {for (User member: group.getMembers())watch(issue, member, true);}String url = urlManager.urlFor(issue);- for (Map.Entry<String, User> entry: newUsers.entrySet()) {+ for (Map.Entry<String, Collection<User>> entry: newUsers.entrySet()) {String subject = String.format("You are now \"%s\" of issue #%d: %s",entry.getKey(), issue.getNumber(), issue.getTitle());String body = String.format("Visit <a href='%s'>%s</a> for details", url, url);- mailManager.sendMailAsync(Lists.newArrayList(entry.getValue().getEmail()), subject, body.toString());- notifiedUsers.add(entry.getValue());+ Set<String> emails = entry.getValue().stream().map(it->it.getEmail()).collect(Collectors.toSet());+ mailManager.sendMailAsync(emails, subject, body.toString());+ notifiedUsers.addAll(entry.getValue());}Collection<User> usersToNotify = new HashSet<>();diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.javaindex 207d03d968..20b20f8624 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java@@ -43,32 +43,28 @@ public class ChoiceFieldCriteria extends FieldCriteria {@Overrideprotected Predicate getValuePredicate(Join<?, ?> field, CriteriaBuilder builder) {- if (allowMultiple) {+ if (allowMultiple)return builder.equal(field.get(IssueField.ATTR_VALUE), value);- } else {- if (operator == IssueQueryLexer.Is)- return builder.equal(field.get(IssueField.ATTR_VALUE), value);- else if (operator == IssueQueryLexer.IsGreaterThan)- return builder.greaterThan(field.get(IssueField.ATTR_ORDINAL), ordinal);- else- return builder.lessThan(field.get(IssueField.ATTR_ORDINAL), ordinal);- }+ else if (operator == IssueQueryLexer.Is)+ return builder.equal(field.get(IssueField.ATTR_VALUE), value);+ else if (operator == IssueQueryLexer.IsGreaterThan)+ return builder.greaterThan(field.get(IssueField.ATTR_ORDINAL), ordinal);+ else+ return builder.lessThan(field.get(IssueField.ATTR_ORDINAL), ordinal);}@SuppressWarnings("unchecked")@Overridepublic boolean matches(Issue issue) {Object fieldValue = issue.getFieldValue(getFieldName());- if (allowMultiple) {+ if (allowMultiple)return ((List<String>)fieldValue).contains(value);- } else {- if (operator == IssueQueryLexer.Is)- return Objects.equals(fieldValue, value);- else if (operator == IssueQueryLexer.IsGreaterThan)- return issue.getFieldOrdinal(getFieldName(), fieldValue) > ordinal;- else- return issue.getFieldOrdinal(getFieldName(), fieldValue) < ordinal;- }+ else if (operator == IssueQueryLexer.Is)+ return Objects.equals(fieldValue, value);+ else if (operator == IssueQueryLexer.IsGreaterThan)+ return issue.getFieldOrdinal(getFieldName(), fieldValue) > ordinal;+ else+ return issue.getFieldOrdinal(getFieldName(), fieldValue) < ordinal;}@Override@@ -83,9 +79,8 @@ public class ChoiceFieldCriteria extends FieldCriteria {Collection<UndefinedFieldValue> undefinedFieldValues = new HashSet<>();GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();SpecifiedChoices specifiedChoices = SpecifiedChoices.of(issueSetting.getFieldSpec(getFieldName()));- if (specifiedChoices != null && !specifiedChoices.getChoiceValues().contains(value)) {+ if (specifiedChoices != null && !specifiedChoices.getChoiceValues().contains(value))undefinedFieldValues.add(new UndefinedFieldValue(getFieldName(), value));- }return undefinedFieldValues;}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.javaindex 8a90c63b6c..e39276e51d 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.java@@ -4,6 +4,7 @@ import java.util.Collection;import java.util.HashSet;import java.util.Set;+import javax.annotation.Nullable;import javax.persistence.criteria.CriteriaBuilder;import javax.persistence.criteria.Join;import javax.persistence.criteria.JoinType;@@ -37,12 +38,23 @@ public abstract class FieldCriteria extends IssueCriteria {@Overridepublic final Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {Join<?, ?> join = root.join(IssueQueryConstants.ATTR_FIELDS, JoinType.LEFT);- join.on(builder.and(- builder.equal(join.get(IssueField.ATTR_NAME), getFieldName()),- getValuePredicate(join, builder)));- return join.isNotNull();+ Predicate valuePredicate = getValuePredicate(join, builder);+ if (valuePredicate != null) {+ join.on(builder.and(+ builder.equal(join.get(IssueField.ATTR_NAME), getFieldName()),+ getValuePredicate(join, builder)));+ return join.isNotNull();+ } else {+ join.on(builder.and(+ builder.equal(join.get(IssueField.ATTR_NAME), getFieldName()),+ builder.or(builder.isNull(join.get(IssueField.ATTR_VALUE)))));+ Join<?, ?> join2 = root.join(IssueQueryConstants.ATTR_FIELDS, JoinType.LEFT);+ join2.on(builder.equal(join2.get(IssueField.ATTR_NAME), getFieldName()));+ return builder.or(join.isNotNull(), join2.isNull());+ }}+ @Nullableprotected abstract Predicate getValuePredicate(Join<?, ?> field, CriteriaBuilder builder);@Overridediff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.javaindex c49d24dbd9..07a0403518 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldOperatorCriteria.java@@ -1,7 +1,9 @@package io.onedev.server.search.entity.issue;import java.nio.channels.IllegalSelectorException;+import java.util.ArrayList;import java.util.Collection;+import java.util.List;import java.util.Objects;import java.util.Set;import java.util.stream.Collectors;@@ -30,10 +32,13 @@ public class FieldOperatorCriteria extends FieldCriteria {private static final long serialVersionUID = 1L;private final int operator;++ private final boolean allowMultiple;- public FieldOperatorCriteria(String name, int operator) {+ public FieldOperatorCriteria(String name, int operator, boolean allowMultiple) {super(name);this.operator = operator;+ this.allowMultiple = allowMultiple;}@Override@@ -41,7 +46,7 @@ public class FieldOperatorCriteria extends FieldCriteria {Path<?> valueAttribute = field.get(IssueField.ATTR_VALUE);Path<?> projectAttribute = field.getParent().get(IssueQueryConstants.ATTR_PROJECT);if (operator == IssueQueryLexer.IsEmpty) {- return builder.isNull(valueAttribute);+ return null;} else if (operator == IssueQueryLexer.IsMe) {if (User.get() != null)return builder.equal(valueAttribute, User.get().getName());@@ -157,12 +162,30 @@ public class FieldOperatorCriteria extends FieldCriteria {return quote(getFieldName()) + " " + IssueQuery.getRuleName(operator);}+ @SuppressWarnings({ "rawtypes", "unchecked" })@Overridepublic void fill(Issue issue, Set<String> initedLists) {- if (operator == IssueQueryLexer.IsEmpty)+ if (operator == IssueQueryLexer.IsEmpty) {issue.setFieldValue(getFieldName(), null);- else if (operator == IssueQueryLexer.IsMe)- issue.setFieldValue(getFieldName(), SecurityUtils.getUser().getName());+ } else if (operator == IssueQueryLexer.IsMe) {+ if (allowMultiple) {+ List list;+ if (!initedLists.contains(getFieldName())) {+ list = new ArrayList();+ issue.setFieldValue(getFieldName(), list);+ initedLists.add(getFieldName());+ } else {+ list = (List) issue.getFieldValue(getFieldName());+ if (list == null) {+ list = new ArrayList();+ issue.setFieldValue(getFieldName(), list);+ }+ }+ list.add(SecurityUtils.getUser().getName());+ } else {+ issue.setFieldValue(getFieldName(), SecurityUtils.getUser().getName());+ }+ }}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.javaindex 5cc65da69a..31cccc8163 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java@@ -151,8 +151,10 @@ public class IssueQuery extends EntityQuery<Issue> {}if (fieldName.equals(IssueQueryConstants.FIELD_MILESTONE))return new MilestoneIsEmptyCriteria();- else- return new FieldOperatorCriteria(fieldName, operator);+ else {+ FieldSpec fieldSpec = getGlobalIssueSetting().getFieldSpec(fieldName);+ return new FieldOperatorCriteria(fieldName, operator, fieldSpec.isAllowMultiple());+ }}public IssueCriteria visitOperatorValueCriteria(OperatorValueCriteriaContext ctx) {@@ -211,20 +213,8 @@ public class IssueQuery extends EntityQuery<Issue> {return new TitleCriteria(value);} else if (fieldName.equals(IssueQueryConstants.FIELD_DESCRIPTION)) {return new DescriptionCriteria(value);- } else if (fieldName.equals(IssueQueryConstants.FIELD_COMMENT)) {- return new CommentCriteria(value);} else {- FieldSpec fieldSpec = getGlobalIssueSetting().getFieldSpec(fieldName);- if (fieldSpec instanceof TextField) {- return new StringFieldCriteria(fieldName, value, operator);- } else {- long ordinal;- if (validate)- ordinal = getValueOrdinal((ChoiceField) fieldSpec, value);- else- ordinal = 0;- return new ChoiceFieldCriteria(fieldName, value, ordinal, operator, true);- }+ return new CommentCriteria(value);}case IssueQueryLexer.Is:if (fieldName.equals(IssueQueryConstants.FIELD_PROJECT)) {@@ -255,10 +245,10 @@ public class IssueQuery extends EntityQuery<Issue> {return new NumericFieldCriteria(fieldName, getIntValue(value), operator);} else if (field instanceof ChoiceField) {long ordinal = getValueOrdinal((ChoiceField) field, value);- return new ChoiceFieldCriteria(fieldName, value, ordinal, operator, false);+ return new ChoiceFieldCriteria(fieldName, value, ordinal, operator, field.isAllowMultiple());} else if (field instanceof UserChoiceField|| field instanceof GroupChoiceField) {- return new ChoiceFieldCriteria(fieldName, value, -1, operator, false);+ return new ChoiceFieldCriteria(fieldName, value, -1, operator, field.isAllowMultiple());} else {return new StringFieldCriteria(fieldName, value, operator);}@@ -391,8 +381,7 @@ public class IssueQuery extends EntityQuery<Issue> {if (!fieldName.equals(IssueQueryConstants.FIELD_TITLE)&& !fieldName.equals(IssueQueryConstants.FIELD_DESCRIPTION)&& !fieldName.equals(IssueQueryConstants.FIELD_COMMENT)- && !(fieldSpec instanceof TextField)- && !(fieldSpec != null && fieldSpec.isAllowMultiple())) {+ && !(fieldSpec instanceof TextField)) {throw newOperatorException(fieldName, operator);}break;@@ -422,7 +411,7 @@ public class IssueQuery extends EntityQuery<Issue> {&& !fieldName.equals(IssueQueryConstants.FIELD_COMMENT_COUNT)&& !fieldName.equals(IssueQueryConstants.FIELD_NUMBER)&& !(fieldSpec instanceof NumberField)- && !(fieldSpec instanceof ChoiceField))+ && !(fieldSpec instanceof ChoiceField && !fieldSpec.isAllowMultiple()))throw newOperatorException(fieldName, operator);break;}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmitDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmitDateCriteria.javaindex 1dbc970075..67965bd5f8 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmitDateCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmitDateCriteria.java@@ -8,7 +8,6 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import io.onedev.server.model.Issue;-import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.query.IssueQueryConstants;diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/UserChoiceInput.java b/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/UserChoiceInput.javaindex 3482b97399..85c1d0ec3e 100755--- a/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/UserChoiceInput.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/UserChoiceInput.java@@ -5,14 +5,13 @@ import java.util.List;import java.util.Map;import java.util.stream.Collectors;-import javax.validation.ValidationException;-import com.google.common.collect.Lists;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.util.inputspec.userchoiceinput.choiceprovider.ChoiceProvider;+import io.onedev.server.util.inputspec.userchoiceinput.defaultmultivalueprovider.DefaultMultiValueProvider;import io.onedev.server.util.inputspec.userchoiceinput.defaultvalueprovider.DefaultValueProvider;public class UserChoiceInput {@@ -22,33 +21,45 @@ public class UserChoiceInput {}public static String getPropertyDef(InputSpec inputSpec, Map<String, Integer> indexes,- ChoiceProvider choiceProvider, DefaultValueProvider defaultValueProvider) {+ ChoiceProvider choiceProvider, DefaultValueProvider defaultValueProvider,+ DefaultMultiValueProvider defaultMultiValueProvider) {int index = indexes.get(inputSpec.getName());StringBuffer buffer = new StringBuffer();- inputSpec.appendField(buffer, index, "String");+ inputSpec.appendField(buffer, index, inputSpec.isAllowMultiple()? "List<String>": "String");inputSpec.appendCommonAnnotations(buffer, index);- if (!inputSpec.isAllowEmpty())- buffer.append(" @NotEmpty\n");+ if (!inputSpec.isAllowEmpty()) {+ if (inputSpec.isAllowMultiple())+ buffer.append(" @Size(min=1, message=\"At least one option needs to be selected\")\n");+ else+ buffer.append(" @NotEmpty\n");+ }inputSpec.appendChoiceProvider(buffer, index, "@UserChoice");- inputSpec.appendMethods(buffer, index, "String", choiceProvider, defaultValueProvider);++ if (inputSpec.isAllowMultiple())+ inputSpec.appendMethods(buffer, index, "List<String>", choiceProvider, defaultMultiValueProvider);+ else+ inputSpec.appendMethods(buffer, index, "String", choiceProvider, defaultValueProvider);return buffer.toString();}- public static Object convertToObject(List<String> strings) {- if (strings.size() == 0)+ public static Object convertToObject(InputSpec inputSpec, List<String> strings) {+ if (inputSpec.isAllowMultiple())+ return strings;+ else if (strings.size() == 0)return null;- else if (strings.size() == 1)+ elsereturn strings.iterator().next();- else- throw new ValidationException("Not eligible for multi-value");}- public static List<String> convertToStrings(Object value) {- if (value instanceof String)+ @SuppressWarnings("unchecked")+ public static List<String> convertToStrings(InputSpec inputSpec, Object value) {+ if (value instanceof List)+ return (List<String>) value;+ else if (value instanceof String)return Lists.newArrayList((String) value);elsereturn new ArrayList<>();}-+}diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/AllUsers.java b/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/AllUsers.javaindex 37473dfea1..906d5355f5 100755--- a/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/AllUsers.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/AllUsers.java@@ -12,7 +12,7 @@ import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.page.project.issues.detail.IssueDetailPage;import io.onedev.server.web.util.WicketUtils;-@Editable(order=130, name="All Users in System")+@Editable(order=130, name="All users in system")public class AllUsers implements ChoiceProvider {private static final long serialVersionUID = 1L;diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/ScriptingChoices.java b/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/ScriptingChoices.javaindex 2166366d42..279c59b721 100755--- a/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/ScriptingChoices.java+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/ScriptingChoices.java@@ -24,8 +24,8 @@ public class ScriptingChoices implements ChoiceProvider {private String scriptName;- @Editable(description="Groovy script to be evaluated. The return value should be a list of user facade object to be used as choices. "- + "Check <a href='$docRoot/Scripting' target='_blank'>scripting help</a> for details")+ @Editable(description="Groovy script to be evaluated. The return value should be a list of user "+ + "object to be used as choices. Check <a href='$docRoot/Scripting' target='_blank'>scripting help</a> for details")@ScriptChoice@OmitName@NotEmptydiff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/defaultmultivalueprovider/DefaultMultiValueProvider.java b/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/defaultmultivalueprovider/DefaultMultiValueProvider.javanew file mode 100755index 0000000000..88f83d8428--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/defaultmultivalueprovider/DefaultMultiValueProvider.java@@ -0,0 +1,13 @@+package io.onedev.server.util.inputspec.userchoiceinput.defaultmultivalueprovider;++import java.io.Serializable;+import java.util.List;++import io.onedev.server.web.editable.annotation.Editable;++@Editable+public interface DefaultMultiValueProvider extends Serializable {++ List<String> getDefaultValue();++}diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/defaultmultivalueprovider/ScriptingDefaultMultiValue.java b/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/defaultmultivalueprovider/ScriptingDefaultMultiValue.javanew file mode 100755index 0000000000..7f04342442--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/defaultmultivalueprovider/ScriptingDefaultMultiValue.java@@ -0,0 +1,38 @@+package io.onedev.server.util.inputspec.userchoiceinput.defaultmultivalueprovider;++import java.util.List;++import org.hibernate.validator.constraints.NotEmpty;++import io.onedev.server.util.GroovyUtils;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.OmitName;+import io.onedev.server.web.editable.annotation.ScriptChoice;++@Editable(order=400, name="Evaluate script to get default value")+public class ScriptingDefaultMultiValue implements DefaultMultiValueProvider {++ private static final long serialVersionUID = 1L;++ private String scriptName;++ @Editable(description="Groovy script to be evaluated. It should return list of user login name. "+ + "Check <a href='$docRoot/Scripting' target='_blank'>scripting help</a> for details")+ @ScriptChoice+ @OmitName+ @NotEmpty+ public String getScriptName() {+ return scriptName;+ }++ public void setScriptName(String scriptName) {+ this.scriptName = scriptName;+ }++ @SuppressWarnings("unchecked")+ @Override+ public List<String> getDefaultValue() {+ return (List<String>) GroovyUtils.evalScriptByName(scriptName);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/defaultmultivalueprovider/SpecifiedDefaultMultiValue.java b/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/defaultmultivalueprovider/SpecifiedDefaultMultiValue.javanew file mode 100755index 0000000000..ebd91e1708--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/defaultmultivalueprovider/SpecifiedDefaultMultiValue.java@@ -0,0 +1,51 @@+package io.onedev.server.util.inputspec.userchoiceinput.defaultmultivalueprovider;++import java.util.ArrayList;+import java.util.List;++import javax.validation.Validator;++import org.hibernate.validator.constraints.NotEmpty;++import io.onedev.server.OneDev;+import io.onedev.server.model.User;+import io.onedev.server.util.EditContext;+import io.onedev.server.util.inputspec.userchoiceinput.choiceprovider.ChoiceProvider;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.OmitName;+import io.onedev.server.web.editable.annotation.UserChoice;++@Editable(order=100, name="Specified default value")+public class SpecifiedDefaultMultiValue implements DefaultMultiValueProvider {++ 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<User> getValueChoices() {+ ChoiceProvider choiceProvider = (ChoiceProvider) EditContext.get(1).getInputValue("choiceProvider");+ if (choiceProvider != null && OneDev.getInstance(Validator.class).validate(choiceProvider).isEmpty())+ return choiceProvider.getChoices(true);+ else+ return new ArrayList<>();+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.javaindex f911ff747d..87c5493bbd 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java@@ -47,7 +47,6 @@ import org.slf4j.LoggerFactory;import com.google.common.collect.Sets;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;-import io.onedev.commons.utils.HtmlUtils;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;import io.onedev.server.OneException;@@ -105,7 +104,7 @@ public abstract class BuildListPanel extends Panel {} catch (Exception e) {logger.debug("Error parsing build query: " + query, e);if (e.getMessage() != null)- error(HtmlUtils.formatAsHtml(e.getMessage()));+ error(e.getMessage());elseerror("Malformed build query");}diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.javaindex 858ba1d936..43cb162576 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java@@ -50,7 +50,6 @@ import org.slf4j.LoggerFactory;import com.google.common.collect.Lists;-import io.onedev.commons.utils.HtmlUtils;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;import io.onedev.server.OneException;@@ -107,7 +106,7 @@ public abstract class CommitListPanel extends Panel {} catch (Exception e) {logger.debug("Error parsing commit query: " + query, e);if (e.getMessage() != null)- error(HtmlUtils.formatAsHtml(e.getMessage()));+ error(e.getMessage());elseerror("Malformed commit query");}@@ -156,7 +155,7 @@ public abstract class CommitListPanel extends Panel {commitHashes = command.call();} catch (Exception e) {if (e.getMessage() != null)- error(HtmlUtils.formatAsHtml(e.getMessage()));+ error(e.getMessage());elseerror("Error calculating commits: check log for details");commitHashes = new ArrayList<>();diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.javaindex 46e4b48dcd..b7431e1b6a 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java@@ -47,7 +47,6 @@ import org.slf4j.Logger;import org.slf4j.LoggerFactory;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;-import io.onedev.commons.utils.HtmlUtils;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;import io.onedev.server.OneException;@@ -105,7 +104,7 @@ public abstract class IssueListPanel extends Panel {} catch (Exception e) {logger.debug("Error parsing issue query: " + query, e);if (e.getMessage() != null)- error(HtmlUtils.formatAsHtml(e.getMessage()));+ error(e.getMessage());elseerror("Malformed issue query");}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.javaindex 82af9160e9..a46cabc6fb 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java@@ -39,6 +39,7 @@ import io.onedev.server.issue.TransitionSpec;import io.onedev.server.issue.fieldspec.ChoiceField;import io.onedev.server.issue.fieldspec.DateField;import io.onedev.server.issue.fieldspec.FieldSpec;+import io.onedev.server.issue.fieldspec.UserChoiceField;import io.onedev.server.issue.transitiontrigger.PressButtonTrigger;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;@@ -207,6 +208,12 @@ public abstract class IssueOperationsPanel extends Panel {+ IssueQuery.getRuleName(IssueQueryLexer.Contains) + " "+ Criteria.quote(string));}+ } else if (field instanceof UserChoiceField && ((UserChoiceField)field).isAllowMultiple()) {+ for (String string: strings) {+ criterias.add(Criteria.quote(entry.getKey()) + " "+ + IssueQuery.getRuleName(IssueQueryLexer.Contains) + " "+ + Criteria.quote(string));+ }} else if (!(field instanceof DateField)) {criterias.add(Criteria.quote(entry.getKey()) + " "+ IssueQuery.getRuleName(IssueQueryLexer.Is) + " "diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.javaindex 33c70000a6..96cc987869 100644--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java@@ -37,7 +37,6 @@ import org.slf4j.Logger;import org.slf4j.LoggerFactory;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;-import io.onedev.commons.utils.HtmlUtils;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;import io.onedev.server.OneException;@@ -79,7 +78,7 @@ public class ProjectListPanel extends Panel {} catch (Exception e) {logger.debug("Error parsing project query: " + query, e);if (e.getMessage() != null)- error(HtmlUtils.formatAsHtml(e.getMessage()));+ error(e.getMessage());elseerror("Malformed project query");}diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.javaindex 1a94b96fec..48d17cd1e5 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java@@ -44,7 +44,6 @@ import org.slf4j.Logger;import org.slf4j.LoggerFactory;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;-import io.onedev.commons.utils.HtmlUtils;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;import io.onedev.server.OneException;@@ -93,7 +92,7 @@ public abstract class PullRequestListPanel extends Panel {} catch (Exception e) {logger.debug("Error parsing pull request query: " + query, e);if (e.getMessage() != null)- error(HtmlUtils.formatAsHtml(e.getMessage()));+ error(e.getMessage());elseerror("Malformed pull request query");}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.javaindex 797607277b..8686a1793d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.java@@ -27,7 +27,6 @@ import org.hibernate.criterion.MatchMode;import org.hibernate.criterion.Order;import org.hibernate.criterion.Restrictions;-import io.onedev.commons.utils.HtmlUtils;import io.onedev.server.OneDev;import io.onedev.server.OneException;import io.onedev.server.entitymanager.GroupManager;@@ -163,7 +162,7 @@ public class GroupListPage extends AdministrationPage {OneDev.getInstance(GroupManager.class).delete(rowModel.getObject());setResponsePage(GroupListPage.class);} catch (OneException e) {- getPage().error(HtmlUtils.formatAsHtml(e.getMessage()));+ getPage().error(e.getMessage());}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/profile/GroupProfilePage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/group/profile/GroupProfilePage.javaindex 9de2a97010..8fff43d598 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/profile/GroupProfilePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/profile/GroupProfilePage.java@@ -9,7 +9,6 @@ import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.model.IModel;import org.apache.wicket.request.mapper.parameter.PageParameters;-import io.onedev.commons.utils.HtmlUtils;import io.onedev.server.OneDev;import io.onedev.server.OneException;import io.onedev.server.entitymanager.GroupManager;@@ -89,7 +88,7 @@ public class GroupProfilePage extends GroupPage {OneDev.getInstance(GroupManager.class).delete(getGroup());setResponsePage(GroupListPage.class);} catch (OneException e) {- error(HtmlUtils.formatAsHtml(e.getMessage()));+ error(e.getMessage());}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.javaindex 929093cf3f..4615436b09 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.java@@ -12,7 +12,6 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.request.mapper.parameter.PageParameters;-import io.onedev.commons.utils.HtmlUtils;import io.onedev.server.OneDev;import io.onedev.server.OneException;import io.onedev.server.entitymanager.RoleManager;@@ -106,7 +105,7 @@ public class RoleDetailPage extends AdministrationPage {OneDev.getInstance(RoleManager.class).delete(getRole());setResponsePage(RoleListPage.class);} catch (OneException e) {- error(HtmlUtils.formatAsHtml(e.getMessage()));+ error(e.getMessage());}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.javaindex 5a0fb24546..d0d59bba39 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.java@@ -26,7 +26,6 @@ import org.hibernate.criterion.MatchMode;import org.hibernate.criterion.Order;import org.hibernate.criterion.Restrictions;-import io.onedev.commons.utils.HtmlUtils;import io.onedev.server.OneDev;import io.onedev.server.OneException;import io.onedev.server.entitymanager.RoleManager;@@ -140,7 +139,7 @@ public class RoleListPage extends AdministrationPage {OneDev.getInstance(RoleManager.class).delete(rowModel.getObject());setResponsePage(RoleListPage.class);} catch (OneException e) {- getPage().error(HtmlUtils.formatAsHtml(e.getMessage()));+ getPage().error(e.getMessage());}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.javaindex 728e32acae..c9a8cbd800 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java@@ -59,7 +59,6 @@ import org.eclipse.jgit.revwalk.filter.RevFilter;import com.google.common.base.Preconditions;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;-import io.onedev.commons.utils.HtmlUtils;import io.onedev.server.OneDev;import io.onedev.server.OneException;import io.onedev.server.entitymanager.BuildManager;@@ -722,7 +721,7 @@ public class ProjectBranchesPage extends ProjectPage {newPagingNavigation(target);modal.close();} catch (OneException e) {- error(HtmlUtils.formatAsHtml(e.getMessage()));+ error(e.getMessage());target.add(fragment);}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.javaindex 31c9d20437..095d4ae969 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java@@ -104,13 +104,14 @@ abstract class BoardCardPanel extends GenericPanel<Issue> {for (String fieldName: displayFields) {Input field = getIssue().getFieldInputs().get(fieldName);if (field != null && field.getType().equals(FieldSpec.USER) && !field.getValues().isEmpty()) {- User user = OneDev.getInstance(UserManager.class)- .findByName(field.getValues().iterator().next());- if (user != null) {- String tooltip = field.getName() + ": " + user.getDisplayName();- UserAvatar avatar = new UserAvatar(avatarsView.newChildId(), user);- avatar.add(AttributeAppender.append("title", tooltip));- avatarsView.add(avatar);+ for (String userName: field.getValues()) {+ User user = OneDev.getInstance(UserManager.class).findByName(userName);+ if (user != null) {+ String tooltip = field.getName() + ": " + user.getDisplayName();+ UserAvatar avatar = new UserAvatar(avatarsView.newChildId(), user);+ avatar.add(AttributeAppender.append("title", tooltip));+ avatarsView.add(avatar);+ }}}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.javaindex e6d769a9b6..c2aca2817a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java@@ -88,7 +88,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {criterias.add(new ChoiceFieldCriteria(identifyField,getColumn(), -1, IssueQueryLexer.Is, false));} else {- criterias.add(new FieldOperatorCriteria(identifyField, IssueQueryLexer.IsEmpty));+ criterias.add(new FieldOperatorCriteria(identifyField, IssueQueryLexer.IsEmpty, false));}return new IssueQuery(IssueCriteria.of(criterias), boardQuery.getSorts());} else {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.javaindex f4b83ca51f..6733a18aed 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java@@ -40,7 +40,6 @@ import org.eclipse.jgit.revwalk.RevCommit;import org.eclipse.jgit.revwalk.RevTag;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;-import io.onedev.commons.utils.HtmlUtils;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;import io.onedev.server.OneException;@@ -403,7 +402,7 @@ public class ProjectTagsPage extends ProjectPage {OneDev.getInstance(ProjectManager.class).deleteTag(getProject(), tagName);newPagingNavigation(target);} catch (OneException e) {- tagsContainer.error(HtmlUtils.formatAsHtml(e.getMessage()));+ tagsContainer.error(e.getMessage());}target.add(tagsContainer);}