Skip to content

The Unified and Autonomous Development Platform

Remove default issue creation setting requirement for service desk feature

Robin Shen7f5b0910a55d
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/ServiceDeskSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/ServiceDeskSetting.java
index f48add735b..803d02e867 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/ServiceDeskSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/ServiceDeskSetting.java
@@ -10,7 +10,6 @@ import java.util.Set;
import java.util.stream.Collectors;
import javax.annotation.Nullable;
-import javax.validation.ConstraintValidatorContext;
import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.commons.utils.ExplicitException;
@@ -24,23 +23,16 @@ import io.onedev.server.util.match.PathMatcher;
import io.onedev.server.util.match.StringMatcher;
import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.util.usage.Usage;
-import io.onedev.server.util.validation.Validatable;
-import io.onedev.server.util.validation.annotation.ClassValidating;
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValuesResolution;
import io.onedev.server.web.editable.annotation.Editable;
@Editable
-@ClassValidating
-public class ServiceDeskSetting implements Serializable, Validatable {
+public class ServiceDeskSetting implements Serializable {
private static final long serialVersionUID = 1L;
- private static final String PROP_PROJECT_DESIGNATIONS = "projectDesignations";
-
- private static final String PROP_ISSUE_CREATION_SETTINGS = "issueCreationSettings";
-
private List<SenderAuthorization> senderAuthorizations = new ArrayList<>();
private List<ProjectDesignation> projectDesignations = new ArrayList<>();
@@ -103,6 +95,7 @@ public class ServiceDeskSetting implements Serializable, Validatable {
return null;
}
+ @Nullable
public String getDesignatedProject(String senderAddress) {
Matcher matcher = new StringMatcher();
for (ProjectDesignation designation: projectDesignations) {
@@ -113,7 +106,7 @@ public class ServiceDeskSetting implements Serializable, Validatable {
if (patternSet.matches(matcher, senderAddress))
return designation.getProject();
}
- throw new ExplicitException("No project designated for sender: " + senderAddress);
+ return null;
}
public List<FieldSupply> getIssueCreationSetting(String senderAddress, Project project) {
@@ -221,46 +214,4 @@ public class ServiceDeskSetting implements Serializable, Validatable {
setting.fixUndefinedFieldValues(resolutions);
}
- @Override
- public boolean isValid(ConstraintValidatorContext context) {
- boolean isValid = true;
-
- boolean foundDefault = false;
- for (ProjectDesignation designation: getProjectDesignations()) {
- if (designation.getSenderEmails() == null) {
- foundDefault = true;
- break;
- }
- }
- if (!foundDefault) {
- String errorMessage = "An entry with any sender should be defined to be used as "
- + "default project designation";
- context.buildConstraintViolationWithTemplate(errorMessage)
- .addPropertyNode(PROP_PROJECT_DESIGNATIONS)
- .addConstraintViolation();
- isValid = false;
- }
-
- foundDefault = false;
- for (IssueCreationSetting setting: getIssueCreationSettings()) {
- if (setting.getSenderEmails() == null && setting.getApplicableProjects() == null) {
- foundDefault = true;
- break;
- }
- }
- if (!foundDefault) {
- String errorMessage = "An entry with any sender and any project should be defined "
- + "to be use as default issue creation setting";
- context.buildConstraintViolationWithTemplate(errorMessage)
- .addPropertyNode(PROP_ISSUE_CREATION_SETTINGS)
- .addConstraintViolation();
- isValid = false;
- }
-
- if (!isValid)
- context.disableDefaultConstraintViolation();
-
- return isValid;
- }
-
}
diff --git a/server-core/src/main/java/io/onedev/server/notification/ActivityDetail.java b/server-core/src/main/java/io/onedev/server/notification/ActivityDetail.java
index 197923b430..3620524f20 100644
--- a/server-core/src/main/java/io/onedev/server/notification/ActivityDetail.java
+++ b/server-core/src/main/java/io/onedev/server/notification/ActivityDetail.java
@@ -13,6 +13,7 @@ import io.onedev.server.entitymanager.UrlManager;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.Issue;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.util.HtmlUtils;
import io.onedev.server.util.PropertyChange;
import io.onedev.server.web.asset.emoji.Emojis;
import io.onedev.server.web.component.codecomment.referencedfrom.ReferencedFromCodeCommentPanel;
@@ -65,18 +66,18 @@ public class ActivityDetail implements Serializable {
builder.append("<tr>");
if (changes.size() != 1 || !hideNameIfOnlyOneRow) {
builder.append(" <td style='padding:0.4em 0.6em; font-size:0.9em; border-bottom:1px solid #EBEDF3; text-align:left;'>");
- builder.append("<pre style='margin-bottom:0; font-size:inherit;'>" + HtmlEscape.escapeHtml5(change.getName()) + "</pre>");
+ builder.append(HtmlEscape.escapeHtml5(change.getName()));
builder.append(" </td>");
}
builder.append(" <td style='padding:0.4em 0.6em; font-size:0.9em; border-bottom:1px solid #EBEDF3; text-align:left;'>");
if (change.getOldValue() != null)
- builder.append("<pre style='margin-bottom:0; font-size:inherit;'>" + HtmlEscape.escapeHtml5(change.getOldValue()) + "</pre>");
+ builder.append(HtmlUtils.formatAsHtml(change.getOldValue()));
else
builder.append("<i>empty</i>");
builder.append(" </td>");
builder.append(" <td style='padding:0.4em 0.6em; font-size:0.9em; border-bottom:1px solid #EBEDF3; font-size:0.9em; text-align:left;'>");
if (change.getNewValue() != null)
- builder.append("<pre style='margin-bottom:0; font-size: inherit;'>" + HtmlEscape.escapeHtml5(change.getNewValue()) + "</pre>");
+ builder.append(HtmlUtils.formatAsHtml(change.getNewValue()));
else
builder.append("<i>empty</i>");
builder.append(" </td>");
diff --git a/server-core/src/main/java/io/onedev/server/notification/DefaultMailManager.java b/server-core/src/main/java/io/onedev/server/notification/DefaultMailManager.java
index 56db3526e5..aea96d5b28 100644
--- a/server-core/src/main/java/io/onedev/server/notification/DefaultMailManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/DefaultMailManager.java
@@ -341,6 +341,8 @@ public class DefaultMailManager implements MailManager {
EmailAddress receiverAddress = EmailAddress.parse(receiver.getAddress());
if (receiverAddress.toString().equals(systemAddress.toString())) {
if (serviceDeskSetting != null) {
+ if (designatedProject == null)
+ throw new ExplicitException("No project designated for sender: " + from.getAddress());
Project project = projectManager.find(designatedProject);
if (project == null) {
String errorMessage = String.format(
@@ -497,6 +499,8 @@ public class DefaultMailManager implements MailManager {
Pattern pattern = Pattern.compile("(^|\\W)" + quotedSender.replace(".", "\\.") + "($|\\W)");
Document document = HtmlUtils.parse(content);
+ document.select(".gmail_quote").remove();
+
Element quotedSenderElement = null;
for (Element element: document.getElementsContainingOwnText(quotedSender)) {
if (pattern.matcher(element.text()).find()) {