Skip to content

The Unified and Autonomous Development Platform

Remove service desk marker line as this is not necessary.

Robin Shenc14fed612c63
diff --git a/server-core/src/main/java/io/onedev/server/mail/DefaultMailManager.java b/server-core/src/main/java/io/onedev/server/mail/DefaultMailManager.java
index 507887ace0..d1e3749e15 100644
--- a/server-core/src/main/java/io/onedev/server/mail/DefaultMailManager.java
+++ b/server-core/src/main/java/io/onedev/server/mail/DefaultMailManager.java
@@ -429,8 +429,7 @@ public class DefaultMailManager implements MailManager {
throw new ExplicitException(errorMessage);
}
checkPermission(from, project, new AccessProject(), user, authorization);
- issues.add(openIssue(message, serviceDeskSetting.getPreserveBefore(),
- project, from, user, authorization));
+ issues.add(openIssue(message, project, from, user, authorization));
} else {
throw new ExplicitException("Unable to create issue from email as service desk is not enabled");
}
@@ -515,8 +514,7 @@ public class DefaultMailManager implements MailManager {
if (serviceDeskSetting != null) {
checkPermission(from, project, new AccessProject(), user, authorization);
logger.debug("Creating issue via email (project: {})...", project.getPath());
- issues.add(openIssue(message, serviceDeskSetting.getPreserveBefore(), project,
- from, user, authorization));
+ issues.add(openIssue(message, project, from, user, authorization));
} else {
throw new ExplicitException("Unable to create issue from email as service desk is not enabled");
}
@@ -714,9 +712,8 @@ public class DefaultMailManager implements MailManager {
return null;
}
- private Issue openIssue(Message message, @Nullable String preserveBefore,
- Project project, InternetAddress submitter, @Nullable User user,
- @Nullable SenderAuthorization authorization) throws MessagingException, IOException {
+ private Issue openIssue(Message message, Project project, InternetAddress submitter,
+ @Nullable User user, @Nullable SenderAuthorization authorization) throws MessagingException, IOException {
Issue issue = new Issue();
issue.setProject(project);
if (StringUtils.isNotBlank(message.getSubject()))
@@ -729,18 +726,8 @@ public class DefaultMailManager implements MailManager {
issue.setThreadingReference(messageId);
String description = readText(project, issue.getUUID(), message);
- if (StringUtils.isNotBlank(description)) {
- if (preserveBefore != null)
- description = StringUtils.substringBefore(description, preserveBefore);
-
- Document document = HtmlUtils.parse(description);
- document.outputSettings().prettyPrint(false);
-
- description = getContent(document);
-
- if (description != null)
- issue.setDescription("<div class='no-color'>" + description + "</div>");
- }
+ if (StringUtils.isNotBlank(description))
+ issue.setDescription("<div class='no-color'>" + description + "</div>");
if (user == null)
user = createUser(submitter, project, authorization.getAuthorizedRole());
diff --git a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
index 6a8edd038b..559ac5d7c1 100644
--- a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
+++ b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
@@ -4287,4 +4287,24 @@ public class DataMigrator {
}
}
+ private void migrate96(File dataDir, Stack<Integer> versions) {
+ for (File file: dataDir.listFiles()) {
+ if (file.getName().startsWith("Settings.xml")) {
+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);
+ for (Element element: dom.getRootElement().elements()) {
+ String key = element.elementTextTrim("key");
+ if (key.equals("SERVICE_DESK_SETTING")) {
+ Element valueElement = element.element("value");
+ if (valueElement != null) {
+ Element preserveBeforeElement = valueElement.element("preserveBefore");
+ if (preserveBeforeElement != null)
+ preserveBeforeElement.detach();
+ }
+ }
+ }
+ dom.writeToFile(file, false);
+ }
+ }
+ }
+
}
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 135a5614bb..bb4d2cf8eb 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
@@ -38,8 +38,6 @@ public class ServiceDeskSetting implements Serializable {
private List<IssueCreationSetting> issueCreationSettings = new ArrayList<>();
- private String preserveBefore;
-
@Editable(order=100, description="When sender email address can not be mapped to an existing user, "
+ "OneDev will use entries defined here to determine if the sender has permission to "
+ "create issues. For a particular sender, the first matching entry will take "
@@ -82,16 +80,6 @@ public class ServiceDeskSetting implements Serializable {
this.issueCreationSettings = issueCreationSettings;
}
- @Editable(order=400, name="Marker Line", description="Optionally specify a marker line. Only content before this line "
- + "will be preserved when create issue from email")
- public String getPreserveBefore() {
- return preserveBefore;
- }
-
- public void setPreserveBefore(String preserveBefore) {
- this.preserveBefore = preserveBefore;
- }
-
@Nullable
public SenderAuthorization getSenderAuthorization(String senderAddress) {
Matcher matcher = new StringMatcher();