Skip to content

The Unified and Autonomous Development Platform

feat: able to customize all email templates (#1139)

Robin Shen1fdf1e1ce88f
diff --git a/server-core/src/main/java/io/onedev/server/annotation/Code.java b/server-core/src/main/java/io/onedev/server/annotation/Code.java
index f7f0dc74bb..d673fc6598 100644
--- a/server-core/src/main/java/io/onedev/server/annotation/Code.java
+++ b/server-core/src/main/java/io/onedev/server/annotation/Code.java
@@ -29,7 +29,7 @@ public @interface Code {
String POWER_SHELL = "PowerShell";
- String HTML_TEMPLATE = "Java Server Pages";
+ String GROOVY_TEMPLATE = "Java Server Pages";
String language();
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/param/supply/Ignore.java b/server-core/src/main/java/io/onedev/server/buildspec/param/supply/Ignore.java
index 87d38db01b..3abd195514 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/param/supply/Ignore.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/param/supply/Ignore.java
@@ -9,12 +9,12 @@ import io.onedev.server.buildspec.param.ParamCombination;
import io.onedev.server.model.Build;
import io.onedev.server.annotation.Editable;
-@Editable(name="Ignore")
+@Editable(name="Do not use this param")
public class Ignore implements ValuesProvider {
private static final long serialVersionUID = 1L;
- public static final String DISPLAY_NAME = "Ignore";
+ public static final String DISPLAY_NAME = "Do not use this param";
@Override
public boolean equals(Object other) {
diff --git a/server-core/src/main/java/io/onedev/server/data/DefaultDataManager.java b/server-core/src/main/java/io/onedev/server/data/DefaultDataManager.java
index c2d1bd52fb..87c5a7ee43 100644
--- a/server-core/src/main/java/io/onedev/server/data/DefaultDataManager.java
+++ b/server-core/src/main/java/io/onedev/server/data/DefaultDataManager.java
@@ -1,7 +1,6 @@
package io.onedev.server.data;
import com.google.common.base.Preconditions;
-import com.google.common.base.Throwables;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import io.onedev.commons.bootstrap.Bootstrap;
@@ -27,7 +26,7 @@ import io.onedev.server.model.*;
import io.onedev.server.model.Setting.Key;
import io.onedev.server.model.support.administration.*;
import io.onedev.server.model.support.administration.mailsetting.MailSetting;
-import io.onedev.server.model.support.administration.notificationtemplate.NotificationTemplateSetting;
+import io.onedev.server.model.support.administration.emailtemplates.EmailTemplates;
import io.onedev.server.model.support.issue.LinkSpecOpposite;
import io.onedev.server.persistence.HibernateConfig;
import io.onedev.server.persistence.PersistenceUtils;
@@ -61,7 +60,6 @@ import org.quartz.CronScheduleBuilder;
import org.quartz.ScheduleBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.unbescape.html.HtmlEscape;
import javax.inject.Inject;
import javax.inject.Singleton;
@@ -844,9 +842,9 @@ public class DefaultDataManager implements DataManager, Serializable {
});
}
- setting = settingManager.getSetting(Key.NOTIFICATION_TEMPLATE_SETTING);
+ setting = settingManager.getSetting(Key.EMAIL_TEMPLATES);
if (setting == null) {
- settingManager.saveNotificationTemplateSetting(new NotificationTemplateSetting());
+ settingManager.saveEmailTemplates(new EmailTemplates());
}
setting = settingManager.getSetting(Key.CONTRIBUTED_SETTINGS);
diff --git a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
index 9072396ba6..8409ef440d 100644
--- a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
+++ b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java
@@ -5531,10 +5531,52 @@ public class DataMigrator {
for (File file: dataDir.listFiles()) {
if (file.getName().startsWith("Alerts.xml")) {
VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);
- for (Element element : dom.getRootElement().elements())
+ for (Element element : dom.getRootElement().elements())
element.addElement("mailError").setText("false");
+ } else if (file.getName().startsWith("Settings.xml")) {
+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);
+ for (Element element : dom.getRootElement().elements()) {
+ var keyElement = element.element("key");
+ if (keyElement.getTextTrim().equals("NOTIFICATION_TEMPLATE_SETTING")) {
+ keyElement.setText("EMAIL_TEMPLATES");
+ Element valueElement = element.element("value");
+
+ List<String> lines = new ArrayList<>();
+ for (var lineElement: valueElement.element("issueNotificationTemplate").elements())
+ lines.add(lineElement.getText());
+ var issueNotificationTemplate = StringUtils.join(lines, "\n");
+
+ String pullRequestNotificationTemplate;
+ var pullRequestNotificationTemplateElement = valueElement.element("pullRequestNotificationTemplate");
+ if (pullRequestNotificationTemplateElement.attributeValue("reference") != null) {
+ pullRequestNotificationTemplate = issueNotificationTemplate;
+ } else {
+ lines.clear();
+ for (var lineElement: valueElement.element("pullRequestNotificationTemplate").elements())
+ lines.add(lineElement.getText());
+ pullRequestNotificationTemplate = StringUtils.join(lines, "\n");
+ }
+
+ valueElement.detach();
+
+ Element emailTemplatesElement;
+ try (InputStream is = getClass().getResourceAsStream("migrate131_email_templates.xml")) {
+ Preconditions.checkNotNull(is);
+ var xml = IOUtils.toString(is, StandardCharsets.UTF_8.name());
+ emailTemplatesElement = VersionedXmlDoc.fromXML(xml).getRootElement();
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ emailTemplatesElement.element("issueNotification").setText(issueNotificationTemplate);
+ emailTemplatesElement.element("pullRequestNotification").setText(pullRequestNotificationTemplate);
+ emailTemplatesElement.setName("value");
+ emailTemplatesElement.addAttribute("class", "io.onedev.server.model.support.administration.emailtemplates.EmailTemplates");
+ element.add(emailTemplatesElement);
+ break;
+ }
+ }
+ dom.writeToFile(file, false);
}
}
}
-
}
diff --git a/server-core/src/main/java/io/onedev/server/data/migration/migrate131_email_templates.xml b/server-core/src/main/java/io/onedev/server/data/migration/migrate131_email_templates.xml
new file mode 100644
index 0000000000..814fd3a082
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/data/migration/migrate131_email_templates.xml
@@ -0,0 +1,249 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<io.onedev.server.model.support.administration.emailtemplates.EmailTemplates revision="0">
+ <issueNotification>&lt;%
+ if (htmlVersion) {
+ print """
+ &lt;b&gt;${eventSummary}&lt;/b&gt;
+ &lt;br&gt;
+ &lt;br&gt;
+ """
+
+ if (eventBody != null) {
+ print """
+ ${eventBody}
+ &lt;br&gt;
+ """
+ }
+
+ if (replyable)
+ print """
+ &lt;div&gt;Reply this email to post comment, or click &lt;a href='${eventUrl}'&gt;this link&lt;/a&gt; for details&lt;/div&gt;
+ """
+ else
+ print """
+ &lt;div&gt;Click &lt;a href='${eventUrl}'&gt;this link&lt;/a&gt; for details&lt;/div&gt;
+ """
+ } else {
+ print "${eventSummary}\n\n"
+
+ if (eventBody != null)
+ print "${eventBody}\n\n"
+
+ if (replyable)
+ print "Reply this email to post comment, or visit ${eventUrl} for details"
+ else
+ print "Visit ${eventUrl} for details"
+ }
+%&gt;
+
+&lt;%
+ if (unsubscribable != null) {
+ if (htmlVersion) {
+ print """
+ &lt;div style='border-top:1px solid #EEE; margin-top:1em; padding-top:1em; color:#666; font-size:0.9em;'&gt;You received this as you
+ are participating in this topic.
+ """
+ if (unsubscribable.getEmailAddress() != null)
+ print """
+ Mail to &lt;a href='mailto:${unsubscribable.emailAddress}?subject=Unsubscribe&amp;body=I would like not to get any notifications from this topic'&gt;this address&lt;/a&gt; to unsubscribe
+ &lt;/div&gt;
+ """
+ else
+ print """
+ To stop receiving notifications of this topic, please visit detail link above and unwatch it
+ &lt;/div&gt;
+ """
+ } else {
+ print "\n\n---------------------------------------------\n"
+ print "You received this notification as you are participating in this topic. "
+
+ if (unsubscribable.getEmailAddress() != null)
+ print "Mail to ${unsubscribable.emailAddress} with any content to unsubscribe"
+ else
+ print "To stop receiving notifications of this topic, please visit detail link above and unwatch it"
+ }
+ }
+%&gt;</issueNotification>
+ <pullRequestNotification>&lt;%
+ if (htmlVersion) {
+ print """
+ &lt;b&gt;${eventSummary}&lt;/b&gt;
+ &lt;br&gt;
+ &lt;br&gt;
+ """
+
+ if (eventBody != null) {
+ print """
+ ${eventBody}
+ &lt;br&gt;
+ """
+ }
+
+ if (replyable)
+ print """
+ &lt;div&gt;Reply this email to post comment, or click &lt;a href='${eventUrl}'&gt;this link&lt;/a&gt; for details&lt;/div&gt;
+ """
+ else
+ print """
+ &lt;div&gt;Click &lt;a href='${eventUrl}'&gt;this link&lt;/a&gt; for details&lt;/div&gt;
+ """
+ } else {
+ print "${eventSummary}\n\n"
+
+ if (eventBody != null)
+ print "${eventBody}\n\n"
+
+ if (replyable)
+ print "Reply this email to post comment, or visit ${eventUrl} for details"
+ else
+ print "Visit ${eventUrl} for details"
+ }
+%&gt;
+
+&lt;%
+ if (unsubscribable != null) {
+ if (htmlVersion) {
+ print """
+ &lt;div style='border-top:1px solid #EEE; margin-top:1em; padding-top:1em; color:#666; font-size:0.9em;'&gt;You received this as you
+ are participating in this topic.
+ """
+ if (unsubscribable.getEmailAddress() != null)
+ print """
+ Mail to &lt;a href='mailto:${unsubscribable.emailAddress}?subject=Unsubscribe&amp;body=I would like not to get any notifications from this topic'&gt;this address&lt;/a&gt; to unsubscribe
+ &lt;/div&gt;
+ """
+ else
+ print """
+ To stop receiving notifications of this topic, please visit detail link above and unwatch it
+ &lt;/div&gt;
+ """
+ } else {
+ print "\n\n---------------------------------------------\n"
+ print "You received this notification as you are participating in this topic. "
+
+ if (unsubscribable.getEmailAddress() != null)
+ print "Mail to ${unsubscribable.emailAddress} with any content to unsubscribe"
+ else
+ print "To stop receiving notifications of this topic, please visit detail link above and unwatch it"
+ }
+ }
+%&gt;</pullRequestNotification>
+ <issueNotificationUnsubscribed>You will no longer receive notifications of issue ${issue.FQN} unless mentioned. However if you subscribed to certain issue queries, you may still get notifications of newly created issues matching those queries. In this case, you will need to login to your account and unsubscribe those queries.
+</issueNotificationUnsubscribed>
+ <pullRequestNotificationUnsubscribed>You will no longer receive notifications of pull request ${pullRequest.FQN} unless mentioned. However if you subscribed to certain pull request queries, you may still get notifications of newly submitted pull request matching those queries. In this case, you will need to login to your account and unsubscribe those queries.
+</pullRequestNotificationUnsubscribed>
+ <serviceDeskIssueOpened>&lt;%
+ if (htmlVersion)
+ print "Issue &lt;a href='${issue.url}'&gt;${issue.FQN}&lt;/a&gt; is created. You may reply this email to add more comments"
+ else
+ print "Issue ${issue.FQN} is created. You may reply this email to add more comments"
+%&gt;
+</serviceDeskIssueOpened>
+ <serviceDeskIssueOpenFailed>&lt;%
+ import org.unbescape.html.HtmlEscape
+
+ if (htmlVersion) {
+ if (exception.message != null) {
+ print """
+ ${HtmlEscape.escapeHtml5(exception.message)}
+ &lt;br&gt;
+ &lt;br&gt;
+ Contact site administrator if necessary
+ """
+ } else {
+ print """
+ Please contact site administrator
+ """
+ }
+ } else {
+ if (exception.message != null) {
+ print "${exception.message}\n\n"
+ print "Contact site administrator if necessary"
+ } else {
+ print "Please contact site administrator"
+ }
+ }
+%&gt;
+</serviceDeskIssueOpenFailed>
+ <userInvitation>&lt;%
+ if (htmlVersion) {
+ print """
+ Hello,
+ &lt;p style='margin: 16px 0;'&gt;
+ You are invited to use OneDev, please visit below link to set up account:
+ &lt;br&gt;
+ &lt;br&gt;
+ &lt;a href='${setupAccountUrl}'&gt;${setupAccountUrl}&lt;/a&gt;
+ """
+ } else {
+ print "Hello,\n\n"
+ print "You are invited to use OneDev, please visit below link to set up account:\n\n"
+ print setupAccountUrl
+ }
+%&gt;
+</userInvitation>
+ <emailVerification>&lt;%
+ if (htmlVersion) {
+ print """
+ Hello,
+ &lt;p style='margin: 16px 0;'&gt;
+ OneDev account "${user.name}" tries to use email address "${emailAddress}", please visit below link to verify if this is you:
+ &lt;br&gt;&lt;br&gt;
+ &lt;a href='${verificationUrl}'&gt;${verificationUrl}&lt;/a&gt;
+ """
+ } else {
+ print "Hello,\n\n"
+ print "OneDev account \"${user.name}\" tries to use email address \"${emailAddress}\", please visit below link to verify if this is you:\n\n"
+ print verificationUrl
+ }
+%&gt;
+</emailVerification>
+ <passwordReset>&lt;%
+ if (htmlVersion) {
+ print """
+ Dear ${user.displayName},
+ &lt;p style='margin: 16px 0;'&gt;
+ Per your request, password of account \"${user.name}\" at &lt;a href='${serverUrl}'&gt;${serverUrl}&lt;/a&gt; has been reset to:
+ &lt;br&gt;&lt;br&gt;
+ ${newPassword}
+ &lt;br&gt;&lt;br&gt;
+ Please login and change the password in your earliest convenience.
+ """
+ } else {
+ print "Dear ${user.displayName},\n\n"
+ print "Per your request, password of account \"${user.name}\" at \"${serverUrl}\" has been reset to:\n\n"
+ print newPassword + "\n\n"
+ print "Please login and change the password in your earliest convenience."
+ }
+%&gt;
+</passwordReset>
+ <alert>&lt;%
+ import org.unbescape.html.HtmlEscape
+
+ if (htmlVersion) {
+ print """
+ &lt;b&gt;${HtmlEscape.escapeHtml5(alert.subject)}&lt;/b&gt;
+ &lt;br&gt;&lt;br&gt;
+ OneDev URL: &lt;a href='${serverUrl}'&gt;${serverUrl}&lt;/a&gt;
+ """
+ if (alert.detail != null) {
+ print """
+ &lt;br&gt;&lt;br&gt;
+ Error detail:
+ &lt;br&gt;
+ &lt;pre style='font-family: monospace;'&gt;${HtmlEscape.escapeHtml5(alert.detail)}&lt;/pre&gt;
+ """
+ }
+ } else {
+ print "${alert.subject}\n\n"
+ print "OneDev URL: ${serverUrl}\n\n"
+
+ if (alert.detail != null) {
+ print "Error Detail:\n"
+ print alert.detail
+ }
+ }
+%&gt;
+</alert>
+</io.onedev.server.model.support.administration.emailtemplates.EmailTemplates>
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/SettingManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/SettingManager.java
index 0e021556eb..e228e9da2a 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/SettingManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/SettingManager.java
@@ -6,7 +6,7 @@ import io.onedev.server.model.support.administration.*;
import io.onedev.server.model.support.administration.authenticator.Authenticator;
import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;
import io.onedev.server.model.support.administration.mailsetting.MailSetting;
-import io.onedev.server.model.support.administration.notificationtemplate.NotificationTemplateSetting;
+import io.onedev.server.model.support.administration.emailtemplates.EmailTemplates;
import io.onedev.server.model.support.administration.sso.SsoConnector;
import io.onedev.server.persistence.dao.EntityManager;
import io.onedev.server.util.usage.Usage;
@@ -120,9 +120,9 @@ public interface SettingManager extends EntityManager<Setting> {
void saveJobExecutors(List<JobExecutor> jobExecutors);
- NotificationTemplateSetting getNotificationTemplateSetting();
+ EmailTemplates getEmailTemplates();
- void saveNotificationTemplateSetting(NotificationTemplateSetting notificationTemplateSetting);
+ void saveEmailTemplates(EmailTemplates emailTemplates);
@Nullable
ServiceDeskSetting getServiceDeskSetting();
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAlertManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAlertManager.java
index 2e4b255407..a0ec06af12 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAlertManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAlertManager.java
@@ -10,6 +10,7 @@ import io.onedev.server.event.cluster.ConnectionLost;
import io.onedev.server.event.entity.EntityPersisted;
import io.onedev.server.mail.MailManager;
import io.onedev.server.model.Alert;
+import io.onedev.server.model.support.administration.emailtemplates.EmailTemplates;
import io.onedev.server.persistence.SessionManager;
import io.onedev.server.persistence.TransactionManager;
import io.onedev.server.persistence.annotation.Transactional;
@@ -18,12 +19,13 @@ import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.web.util.WicketUtils;
import io.onedev.server.web.websocket.WebSocketManager;
import org.hibernate.criterion.Restrictions;
-import org.unbescape.html.HtmlEscape;
import javax.inject.Inject;
import javax.inject.Singleton;
import java.util.ArrayList;
import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
import static io.onedev.server.model.Alert.PROP_SUBJECT;
@@ -117,24 +119,14 @@ public class DefaultAlertManager extends BaseEntityManager<Alert> implements Ale
}
}
if (!emailAddresses.isEmpty()) {
- String url = settingManager.getSystemSetting().getServerUrl();
- String htmlBody, textBody;
- if (alert.getDetail() != null) {
- htmlBody = String.format(""
- + "OneDev URL: <a href='%s'>%s</a>"
- + "<p style='margin: 16px 0;'>"
- + "<b>Error detail:</b>"
- + "<pre style='font-family: monospace;'>%s</pre>",
- url, url, HtmlEscape.escapeHtml5(alert.getDetail()));
- textBody = String.format(""
- + "URL: %s\n\n"
- + "Error detail:\n"
- + "%s",
- url, alert.getDetail());
- } else {
- htmlBody = String.format("OneDev URL: <a href='%s'>%s</a>", url, url);
- textBody = String.format("OneDev url: %s", url);
- }
+ String serverUrl = settingManager.getSystemSetting().getServerUrl();
+ Map<String, Object> bindings = new HashMap<>();
+ bindings.put("alert", alert);
+ bindings.put("serverUrl", serverUrl);
+
+ String template = settingManager.getEmailTemplates().getAlert();
+ var htmlBody = EmailTemplates.evalTemplate(true, template, bindings);
+ var textBody = EmailTemplates.evalTemplate(false, template, bindings);
mailManager.sendMail(mailSetting.getSendSetting(), emailAddresses, new ArrayList<>(), new ArrayList<>(),
"[Alert] " + alert.getSubject(), htmlBody, textBody, null, null, null);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultEmailAddressManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultEmailAddressManager.java
index 0bbe1ac951..206508579f 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultEmailAddressManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultEmailAddressManager.java
@@ -13,6 +13,7 @@ import io.onedev.server.event.system.SystemStarting;
import io.onedev.server.mail.MailManager;
import io.onedev.server.model.EmailAddress;
import io.onedev.server.model.User;
+import io.onedev.server.model.support.administration.emailtemplates.EmailTemplates;
import io.onedev.server.persistence.SessionManager;
import io.onedev.server.persistence.TransactionManager;
import io.onedev.server.persistence.annotation.Sessional;
@@ -26,6 +27,7 @@ import org.eclipse.jgit.lib.PersonIdent;
import javax.inject.Inject;
import javax.inject.Singleton;
import java.util.Arrays;
+import java.util.HashMap;
import java.util.stream.Collectors;
@Singleton
@@ -205,27 +207,26 @@ public class DefaultEmailAddressManager extends BaseEntityManager<EmailAddress>
&& !emailAddress.isVerified());
User user = emailAddress.getOwner();
-
String serverUrl = settingManager.getSystemSetting().getServerUrl();
-
String verificationUrl = String.format("%s/~verify-email-address/%d/%s",
serverUrl, emailAddress.getId(), emailAddress.getVerificationCode());
- String htmlBody = String.format("Hello,"
- + "<p style='margin: 16px 0;'>"
- + "The account %s at %s tries to use email address %s, please visit below link to verify if this is you:<br><br>"
- + "<a href='%s'>%s</a>",
- user.getName(), serverUrl, emailAddress.getValue(), verificationUrl, verificationUrl);
+
+ var bindings = new HashMap<String, Object>();
+ bindings.put("user", user);
+ bindings.put("emailAddress", emailAddress.getValue());
+ bindings.put("serverUrl", serverUrl);
+ bindings.put("verificationUrl", verificationUrl);
+
+ String template = settingManager.getEmailTemplates().getEmailVerification();
- String textBody = String.format("Hello,\n\n"
- + "The account \"%s\" at \"%s\" tries to use email address \"%s\", please visit below link to verify if this is you:\n\n"
- + "%s",
- user.getName(), serverUrl, emailAddress.getValue(), verificationUrl);
+ var htmlBody = EmailTemplates.evalTemplate(true, template, bindings);
+ var textBody = EmailTemplates.evalTemplate(false, template, bindings);
mailManager.sendMail(
settingManager.getMailSetting().getSendSetting(),
Arrays.asList(emailAddress.getValue()),
Lists.newArrayList(), Lists.newArrayList(),
- "[Verification] Please Verify Your Email Address",
+ "[Email Verification] Please Verify Your Email Address",
htmlBody, textBody, null, null, null);
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java
index 612c365ae7..b0d6f809ae 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java
@@ -8,7 +8,7 @@ import io.onedev.server.model.support.administration.*;
import io.onedev.server.model.support.administration.authenticator.Authenticator;
import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;
import io.onedev.server.model.support.administration.mailsetting.MailSetting;
-import io.onedev.server.model.support.administration.notificationtemplate.NotificationTemplateSetting;
+import io.onedev.server.model.support.administration.emailtemplates.EmailTemplates;
import io.onedev.server.model.support.administration.sso.SsoConnector;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
@@ -134,8 +134,8 @@ public class DefaultSettingManager extends BaseEntityManager<Setting> implements
}
@Override
- public NotificationTemplateSetting getNotificationTemplateSetting() {
- return (NotificationTemplateSetting) getSettingValue(Key.NOTIFICATION_TEMPLATE_SETTING);
+ public EmailTemplates getEmailTemplates() {
+ return (EmailTemplates) getSettingValue(Key.EMAIL_TEMPLATES);
}
@SuppressWarnings("unchecked")
@@ -258,8 +258,8 @@ public class DefaultSettingManager extends BaseEntityManager<Setting> implements
@Transactional
@Override
- public void saveNotificationTemplateSetting(NotificationTemplateSetting notificationTemplateSetting) {
- saveSetting(Key.NOTIFICATION_TEMPLATE_SETTING, notificationTemplateSetting);
+ public void saveEmailTemplates(EmailTemplates emailTemplates) {
+ saveSetting(Key.EMAIL_TEMPLATES, emailTemplates);
}
@Transactional
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserInvitationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserInvitationManager.java
index ff1e28ac04..9b7702c186 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserInvitationManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserInvitationManager.java
@@ -1,28 +1,28 @@
package io.onedev.server.entitymanager.impl;
-import java.util.Arrays;
-import java.util.List;
-
-import javax.annotation.Nullable;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import io.onedev.server.persistence.annotation.Transactional;
-import org.hibernate.criterion.MatchMode;
-import org.hibernate.criterion.Order;
-import org.hibernate.criterion.Restrictions;
-
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
-
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.entitymanager.UserInvitationManager;
import io.onedev.server.mail.MailManager;
import io.onedev.server.model.UserInvitation;
+import io.onedev.server.model.support.administration.emailtemplates.EmailTemplates;
import io.onedev.server.persistence.annotation.Sessional;
+import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.BaseEntityManager;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.persistence.dao.EntityCriteria;
+import org.hibernate.criterion.MatchMode;
+import org.hibernate.criterion.Order;
+import org.hibernate.criterion.Restrictions;
+
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
@Singleton
public class DefaultUserInvitationManager extends BaseEntityManager<UserInvitation> implements UserInvitationManager {
@@ -60,16 +60,13 @@ public class DefaultUserInvitationManager extends BaseEntityManager<UserInvitati
String setupAccountUrl = String.format("%s/~create-user-from-invitation/%d/%s",
serverUrl, invitation.getId(), invitation.getInvitationCode());
- String htmlBody = String.format("Hello,"
- + "<p style='margin: 16px 0;'>"
- + "You are invited to use OneDev, please visit below link to set up account:<br><br>"
- + "<a href='%s'>%s</a>",
- setupAccountUrl, setupAccountUrl);
-
- String textBody = String.format("Hello,\n\n"
- + "You are invited to use OneDev, please visit below link to set up account:\n\n"
- + "%s",
- setupAccountUrl);
+
+ Map<String, Object> bindings = new HashMap<>();
+ bindings.put("setupAccountUrl", setupAccountUrl);
+
+ String template = settingManager.getEmailTemplates().getUserInvitation();
+ String htmlBody = EmailTemplates.evalTemplate(true, template, bindings);
+ String textBody = EmailTemplates.evalTemplate(false, template, bindings);
mailManager.sendMail(
settingManager.getMailSetting().getSendSetting(),
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 9e602222f5..c491724fa4 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
@@ -24,6 +24,7 @@ import io.onedev.server.model.support.administration.GlobalIssueSetting;
import io.onedev.server.model.support.administration.IssueCreationSetting;
import io.onedev.server.model.support.administration.SenderAuthorization;
import io.onedev.server.model.support.administration.ServiceDeskSetting;
+import io.onedev.server.model.support.administration.emailtemplates.EmailTemplates;
import io.onedev.server.model.support.administration.mailsetting.MailSetting;
import io.onedev.server.model.support.issue.field.supply.FieldSupply;
import io.onedev.server.persistence.TransactionManager;
@@ -449,12 +450,16 @@ public class DefaultMailManager implements MailManager, Serializable {
watch.setWatching(false);
issueWatchManager.update(watch);
String subject = "Unsubscribed successfully from issue " + issue.getFQN();
- String body = "You will no longer receive notifications of issue " + issue.getFQN() + " unless mentioned. "
- + "However if you subscribed to certain issue queries, you may still get notifications of newly "
- + "created issues matching those queries. In this case, you will need to login to your account "
- + "and unsubscribe those queries.";
+ String template = settingManager.getEmailTemplates().getIssueNotificationUnsubscribed();
+
+ Map<String, Object> bindings = new HashMap<>();
+ bindings.put("issue", issue);
+
+ String htmlBody = EmailTemplates.evalTemplate(true, template, bindings);
+ String textBody = EmailTemplates.evalTemplate(false, template, bindings);
+
sendMailAsync(Lists.newArrayList(from.getAddress()), Lists.newArrayList(), Lists.newArrayList(),
- subject, body, body, null, null, getMessageId(message));
+ subject, htmlBody, textBody, null, null, getMessageId(message));
}
}
} else {
@@ -475,12 +480,14 @@ public class DefaultMailManager implements MailManager, Serializable {
watch.setWatching(false);
pullRequestWatchManager.update(watch);
String subject = "Unsubscribed successfully from pull request " + pullRequest.getFQN();
- String body = "You will no longer receive notifications of pull request " + pullRequest.getFQN()
- + " unless mentioned. However if you subscribed to certain pull request queries, you may still "
- + "get notifications of newly submitted pull request matching those queries. In this case, you "
- + "will need to login to your account and unsubscribe those queries.";
+
+ String template = StringUtils.join(settingManager.getEmailTemplates().getPullRequestNotificationUnsubscribed(), "\n");
+ Map<String, Object> bindings = new HashMap<>();
+ bindings.put("pullRequest", pullRequest);
+ String htmlBody = EmailTemplates.evalTemplate(true, template, bindings);
+ String textBody = EmailTemplates.evalTemplate(false, template, bindings);
sendMailAsync(Lists.newArrayList(from.getAddress()), Lists.newArrayList(), Lists.newArrayList(),
- subject, body, body, null, null, getMessageId(message));
+ subject, htmlBody, textBody, null, null, getMessageId(message));
}
}
} else {
@@ -754,10 +761,12 @@ public class DefaultMailManager implements MailManager, Serializable {
if (!parsedSubmitterAddress.getDomain().equalsIgnoreCase(parsedSystemAddress.getDomain())
|| !parsedSubmitterAddress.getName().toLowerCase().startsWith(parsedSystemAddress.getName().toLowerCase() + "+")
&& !parsedSubmitterAddress.getName().equalsIgnoreCase(parsedSystemAddress.getName())) {
- String htmlBody = String.format("Issue <a href='%s'>%s</a> is created. You may reply this email to add more comments",
- urlManager.urlFor(issue), issue.getFQN());
- String textBody = String.format("Issue %s is created. You may reply this email to add more comments",
- issue.getFQN());
+
+ String template = StringUtils.join(settingManager.getEmailTemplates().getServiceDeskIssueOpened(), "\n");
+ Map<String, Object> bindings = new HashMap<>();
+ bindings.put("issue", issue);
+ String htmlBody = EmailTemplates.evalTemplate(true, template, bindings);
+ String textBody = EmailTemplates.evalTemplate(false, template, bindings);
sendMailAsync(Lists.newArrayList(submitter.getAddress()), Lists.newArrayList(), Lists.newArrayList(),
"Re: " + issue.getTitle(), htmlBody, textBody, getReplyAddress(issue),
@@ -884,16 +893,13 @@ public class DefaultMailManager implements MailManager, Serializable {
String[] fromHeader = message.getHeader("From");
if (fromHeader != null && fromHeader.length != 0) {
InternetAddress from = InternetAddress.parse(fromHeader[0], true)[0];
- String textBody, htmlBody;
- if (e.getMessage() != null) {
- textBody = e.getMessage() +
- "\n\nContact site administrator if necessary";
- htmlBody = HtmlEscape.escapeHtml5(e.getMessage()) +
- "<br><br>Contact site administrator if necessary";
- } else {
- textBody = "Please contact site administrator";
- htmlBody = "Please contact site administrator";
- }
+
+ String template = StringUtils.join(settingManager.getEmailTemplates().getServiceDeskIssueOpenFailed(), "\n");
+ Map<String, Object> bindings = new HashMap<>();
+ bindings.put("exception", e);
+
+ String htmlBody = EmailTemplates.evalTemplate(true, template, bindings);
+ String textBody = EmailTemplates.evalTemplate(false, template, bindings);
sendMailAsync(Lists.newArrayList(from.getAddress()), new ArrayList<>(),
new ArrayList<>(), "OneDev is unable to process your message",
diff --git a/server-core/src/main/java/io/onedev/server/model/Issue.java b/server-core/src/main/java/io/onedev/server/model/Issue.java
index a385e9078d..110bbd057d 100644
--- a/server-core/src/main/java/io/onedev/server/model/Issue.java
+++ b/server-core/src/main/java/io/onedev/server/model/Issue.java
@@ -8,10 +8,7 @@ import io.onedev.server.OneDev;
import io.onedev.server.annotation.Editable;
import io.onedev.server.attachment.AttachmentStorageSupport;
import io.onedev.server.buildspecmodel.inputspec.InputSpec;
-import io.onedev.server.entitymanager.GroupManager;
-import io.onedev.server.entitymanager.PullRequestManager;
-import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.entitymanager.UserManager;
+import io.onedev.server.entitymanager.*;
import io.onedev.server.entityreference.Referenceable;
import io.onedev.server.infomanager.CommitInfoManager;
import io.onedev.server.infomanager.PullRequestInfoManager;
@@ -841,6 +838,10 @@ public class Issue extends ProjectBelonging implements Referenceable, Attachment
return new ProjectScopedNumber(getProject(), getNumber());
}
+ public String getUrl() {
+ return OneDev.getInstance(UrlManager.class).urlFor(this);
+ }
+
public Collection<Milestone> getMilestones() {
return getSchedules().stream().map(it->it.getMilestone()).collect(Collectors.toList());
}
diff --git a/server-core/src/main/java/io/onedev/server/model/Setting.java b/server-core/src/main/java/io/onedev/server/model/Setting.java
index ff25211748..70f052bcef 100644
--- a/server-core/src/main/java/io/onedev/server/model/Setting.java
+++ b/server-core/src/main/java/io/onedev/server/model/Setting.java
@@ -18,8 +18,8 @@ public class Setting extends AbstractEntity {
public static final String PROP_KEY = "key";
public enum Key {SYSTEM, MAIL, BACKUP, SECURITY, AUTHENTICATOR, ISSUE, JOB_EXECUTORS,
- GROOVY_SCRIPTS, PULL_REQUEST, BUILD, PROJECT, SSH, GPG, SSO_CONNECTORS,
- NOTIFICATION_TEMPLATE_SETTING, CONTRIBUTED_SETTINGS, SERVICE_DESK_SETTING,
+ GROOVY_SCRIPTS, PULL_REQUEST, BUILD, PROJECT, SSH, GPG, SSO_CONNECTORS,
+ EMAIL_TEMPLATES, CONTRIBUTED_SETTINGS, SERVICE_DESK_SETTING,
AGENT, PERFORMANCE, BRANDING, CLUSTER_SETTING, SUBSCRIPTION_DATA, ALERT
};
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/emailtemplates/EmailTemplates.java b/server-core/src/main/java/io/onedev/server/model/support/administration/emailtemplates/EmailTemplates.java
new file mode 100644
index 0000000000..266aac3aa1
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/emailtemplates/EmailTemplates.java
@@ -0,0 +1,239 @@
+package io.onedev.server.model.support.administration.emailtemplates;
+
+import com.google.common.io.Resources;
+import io.onedev.server.annotation.Code;
+import io.onedev.server.annotation.Editable;
+import io.onedev.server.annotation.OmitName;
+import io.onedev.server.util.GroovyUtils;
+
+import javax.validation.constraints.NotEmpty;
+import java.io.IOException;
+import java.io.Serializable;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.Map;
+
+@Editable
+public class EmailTemplates implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final String DEFAULT_NOTIFICATION;
+
+ public static final String DEFAULT_ISSUE_NOTIFICATION_UNSUBSCRIBED;
+
+ public static final String DEFAULT_PULL_REQUEST_NOTIFICATION_UNSUBSCRIBED;
+
+ public static final String DEFAULT_SERVICE_DESK_ISSUE_OPENED;
+
+ public static final String DEFAULT_SERVICE_DESK_ISSUE_OPEN_FAILED;
+
+ public static final String DEFAULT_USER_INVITATION;
+
+ public static final String DEFAULT_EMAIL_VERIFICATION;
+
+ public static final String DEFAULT_PASSWORD_RESET;
+
+ public static final String DEFAULT_ALERT;
+
+ public static final String PROP_ISSUE_NOTIFICATION = "issueNotification";
+
+ public static final String PROP_PULL_REQUEST_NOTIFICATION = "pullRequestNotification";
+
+ public static final String PROP_ISSUE_NOTIFICATION_UNSUBSCRIBED = "issueNotificationUnsubscribed";
+
+ public static final String PROP_PULL_REQUEST_NOTIFICATION_UNSUBSCRIBED = "pullRequestNotificationUnsubscribed";
+
+ public static final String PROP_SERVICE_DESK_ISSUE_OPENED = "serviceDeskIssueOpened";
+
+ public static final String PROP_SERVICE_DESK_ISSUE_OPEN_FAILED = "serviceDeskIssueOpenFailed";
+
+ public static final String PROP_USER_INVITATION = "userInvitation";
+
+ public static final String PROP_EMAIL_VERIFICATION = "emailVerification";
+
+ public static final String PROP_PASSWORD_RESET = "passwordReset";
+
+ public static final String PROP_ALERT = "alert";
+
+ static {
+ try {
+ URL url = Resources.getResource(EmailTemplates.class, "default-notification.tpl");
+ DEFAULT_NOTIFICATION = Resources.toString(url, StandardCharsets.UTF_8);
+
+ url = Resources.getResource(EmailTemplates.class, "default-service-desk-issue-opened.tpl");
+ DEFAULT_SERVICE_DESK_ISSUE_OPENED = Resources.toString(url, StandardCharsets.UTF_8);
+
+ url = Resources.getResource(EmailTemplates.class, "default-service-desk-issue-open-failed.tpl");
+ DEFAULT_SERVICE_DESK_ISSUE_OPEN_FAILED = Resources.toString(url, StandardCharsets.UTF_8);
+
+ url = Resources.getResource(EmailTemplates.class, "default-issue-notification-unsubscribed.tpl");
+ DEFAULT_ISSUE_NOTIFICATION_UNSUBSCRIBED = Resources.toString(url, StandardCharsets.UTF_8);
+
+ url = Resources.getResource(EmailTemplates.class, "default-pull-request-notification-unsubscribed.tpl");
+ DEFAULT_PULL_REQUEST_NOTIFICATION_UNSUBSCRIBED = Resources.toString(url, StandardCharsets.UTF_8);
+
+ url = Resources.getResource(EmailTemplates.class, "default-user-invitation.tpl");
+ DEFAULT_USER_INVITATION = Resources.toString(url, StandardCharsets.UTF_8);
+
+ url = Resources.getResource(EmailTemplates.class, "default-email-verification.tpl");
+ DEFAULT_EMAIL_VERIFICATION = Resources.toString(url, StandardCharsets.UTF_8);
+
+ url = Resources.getResource(EmailTemplates.class, "default-password-reset.tpl");
+ DEFAULT_PASSWORD_RESET = Resources.toString(url, StandardCharsets.UTF_8);
+
+ url = Resources.getResource(EmailTemplates.class, "default-alert.tpl");
+ DEFAULT_ALERT = Resources.toString(url, StandardCharsets.UTF_8);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ private String issueNotification = DEFAULT_NOTIFICATION;
+
+ private String pullRequestNotification = DEFAULT_NOTIFICATION;
+
+ private String issueNotificationUnsubscribed = DEFAULT_ISSUE_NOTIFICATION_UNSUBSCRIBED;
+
+ private String pullRequestNotificationUnsubscribed = DEFAULT_PULL_REQUEST_NOTIFICATION_UNSUBSCRIBED;
+
+ private String serviceDeskIssueOpened = DEFAULT_SERVICE_DESK_ISSUE_OPENED;
+
+ private String serviceDeskIssueOpenFailed = DEFAULT_SERVICE_DESK_ISSUE_OPEN_FAILED;
+
+ private String userInvitation = DEFAULT_USER_INVITATION;
+
+ private String emailVerification = DEFAULT_EMAIL_VERIFICATION;
+
+ private String passwordReset = DEFAULT_PASSWORD_RESET;
+
+ private String alert = DEFAULT_ALERT;
+
+ @Editable(order=200)
+ @Code(language=Code.GROOVY_TEMPLATE)
+ @OmitName
+ @NotEmpty
+ public String getIssueNotification() {
+ return issueNotification;
+ }
+
+ public void setIssueNotification(String issueNotification) {
+ this.issueNotification = issueNotification;
+ }
+
+ @Editable(order=300)
+ @Code(language=Code.GROOVY_TEMPLATE)
+ @OmitName
+ @NotEmpty
+ public String getPullRequestNotification() {
+ return pullRequestNotification;
+ }
+
+ public void setPullRequestNotification(String pullRequestNotification) {
+ this.pullRequestNotification = pullRequestNotification;
+ }
+
+ @Editable(order=310)
+ @Code(language=Code.GROOVY_TEMPLATE)
+ @OmitName
+ @NotEmpty
+ public String getIssueNotificationUnsubscribed() {
+ return issueNotificationUnsubscribed;
+ }
+
+ public void setIssueNotificationUnsubscribed(String issueNotificationUnsubscribed) {
+ this.issueNotificationUnsubscribed = issueNotificationUnsubscribed;
+ }
+
+ @Editable(order=320)
+ @Code(language=Code.GROOVY_TEMPLATE)
+ @OmitName
+ @NotEmpty
+ public String getPullRequestNotificationUnsubscribed() {
+ return pullRequestNotificationUnsubscribed;
+ }
+
+ public void setPullRequestNotificationUnsubscribed(String pullRequestNotificationUnsubscribed) {
+ this.pullRequestNotificationUnsubscribed = pullRequestNotificationUnsubscribed;
+ }
+
+ @Editable(order=400)
+ @Code(language=Code.GROOVY_TEMPLATE)
+ @OmitName
+ @NotEmpty
+ public String getServiceDeskIssueOpened() {
+ return serviceDeskIssueOpened;
+ }
+
+ public void setServiceDeskIssueOpened(String serviceDeskIssueOpened) {
+ this.serviceDeskIssueOpened = serviceDeskIssueOpened;
+ }
+
+ @Editable(order=500)
+ @Code(language=Code.GROOVY_TEMPLATE)
+ @OmitName
+ @NotEmpty
+ public String getServiceDeskIssueOpenFailed() {
+ return serviceDeskIssueOpenFailed;
+ }
+
+ public void setServiceDeskIssueOpenFailed(String serviceDeskIssueOpenFailed) {
+ this.serviceDeskIssueOpenFailed = serviceDeskIssueOpenFailed;
+ }
+
+ @Editable(order=600)
+ @Code(language=Code.GROOVY_TEMPLATE)
+ @OmitName
+ @NotEmpty
+ public String getUserInvitation() {
+ return userInvitation;
+ }
+
+ public void setUserInvitation(String userInvitation) {
+ this.userInvitation = userInvitation;
+ }
+
+ @Editable(order=700)
+ @Code(language=Code.GROOVY_TEMPLATE)
+ @OmitName
+ @NotEmpty
+ public String getEmailVerification() {
+ return emailVerification;
+ }
+
+ public void setEmailVerification(String emailVerification) {
+ this.emailVerification = emailVerification;
+ }
+
+ @Editable(order=800)
+ @Code(language=Code.GROOVY_TEMPLATE)
+ @OmitName
+ @NotEmpty
+ public String getPasswordReset() {
+ return passwordReset;
+ }
+
+ public void setPasswordReset(String passwordReset) {
+ this.passwordReset = passwordReset;
+ }
+
+ @Editable(order=900)
+ @Code(language=Code.GROOVY_TEMPLATE)
+ @OmitName
+ @NotEmpty
+ public String getAlert() {
+ return alert;
+ }
+
+ public void setAlert(String alert) {
+ this.alert = alert;
+ }
+
+ public static String evalTemplate(boolean htmlVersion, String template, Map<String, Object> bindings) {
+ var currentBindins = new HashMap<String, Object>(bindings);
+ currentBindins.put("htmlVersion", htmlVersion);
+ return GroovyUtils.evalTemplate(template, currentBindins);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/emailtemplates/default-alert.tpl b/server-core/src/main/java/io/onedev/server/model/support/administration/emailtemplates/default-alert.tpl
new file mode 100644
index 0000000000..4859b1d5d5
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/emailtemplates/default-alert.tpl
@@ -0,0 +1,27 @@
+<%
+ import org.unbescape.html.HtmlEscape
+
+ if (htmlVersion) {
+ print """
+ <b>${HtmlEscape.escapeHtml5(alert.subject)}</b>
+ <br><br>
+ OneDev URL: <a href='${serverUrl}'>${serverUrl}</a>
+ """
+ if (alert.detail != null) {
+ print """
+ <br><br>
+ Error detail:
+ <br>
+ <pre style='font-family: monospace;'>${HtmlEscape.escapeHtml5(alert.detail)}</pre>
+ """
+ }
+ } else {
+ print "${alert.subject}\n\n"
+ print "OneDev URL: ${serverUrl}\n\n"
+
+ if (alert.detail != null) {
+ print "Error Detail:\n"
+ print alert.detail
+ }
+ }
+%>
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/emailtemplates/default-email-verification.tpl b/server-core/src/main/java/io/onedev/server/model/support/administration/emailtemplates/default-email-verification.tpl
new file mode 100644
index 0000000000..6ae34d3aff
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/emailtemplates/default-email-verification.tpl
@@ -0,0 +1,15 @@
+<%
+ if (htmlVersion) {
+ print """
+ Hello,
+ <p style='margin: 16px 0;'>
+ OneDev account "${user.name}" tries to use email address "${emailAddress}", please visit below link to verify if this is you:
+ <br><br>
+ <a href='${verificationUrl}'>${verificationUrl}</a>
+ """
+ } else {
+ print "Hello,\n\n"
+ print "OneDev account \"${user.name}\" tries to use email address \"${emailAddress}\", please visit below link to verify if this is you:\n\n"
+ print verificationUrl
+ }
+%>
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/emailtemplates/default-issue-notification-unsubscribed.tpl b/server-core/src/main/java/io/onedev/server/model/support/administration/emailtemplates/default-issue-notification-unsubscribed.tpl
new file mode 100644
index 0000000000..4b5cb456a3
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/emailtemplates/default-issue-notification-unsubscribed.tpl
@@ -0,0 +1 @@
+You will no longer receive notifications of issue ${issue.FQN} unless mentioned. However if you subscribed to certain issue queries, you may still get notifications of newly created issues matching those queries. In this case, you will need to login to your account and unsubscribe those queries.
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/emailtemplates/default-notification.tpl b/server-core/src/main/java/io/onedev/server/model/support/administration/emailtemplates/default-notification.tpl
new file mode 100644
index 0000000000..526c093e71
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/emailtemplates/default-notification.tpl
@@ -0,0 +1,64 @@
+<%
+ if (htmlVersion) {
+ print """
+ <b>${eventSummary}</b>
+ <br>
+ <br>
+ """
+
+ if (eventBody != null) {
+ print """
+ ${eventBody}
+ <br>
+ """
+ }
+
+ if (replyable)
+ print """
+ <div>Reply this email to post comment, or click <a href='${eventUrl}'>this link</a> for details</div>
+ """
+ else
+ print """
+ <div>Click <a href='${eventUrl}'>this link</a> for details</div>
+ """
+ } else {
+ print "${eventSummary}\n\n"
+
+ if (eventBody != null)
+ print "${eventBody}\n\n"
+
+ if (replyable)
+ print "Reply this email to post comment, or visit ${eventUrl} for details"
+ else
+ print "Visit ${eventUrl} for details"
+ }
+%>
+
+<%
+ if (unsubscribable != null) {
+ if (htmlVersion) {
+ print """
+ <div style='border-top:1px solid #EEE; margin-top:1em; padding-top:1em; color:#666; font-size:0.9em;'>You received this as you
+ are participating in this topic.
+ """
+ if (unsubscribable.getEmailAddress() != null)
+ print """
+ Mail to <a href='mailto:${unsubscribable.emailAddress}?subject=Unsubscribe&body=I would like not to get any notifications from this topic'>this address</a> to unsubscribe
+ </div>
+ """
+ else
+ print """
+ To stop receiving notifications of this topic, please visit detail link above and unwatch it
+ </div>
+ """
+ } else {
+ print "\n\n---------------------------------------------\n"
+ print "You received this notification as you are participating in this topic. "
+
+ if (unsubscribable.getEmailAddress() != null)
+ print "Mail to ${unsubscribable.emailAddress} with any content to unsubscribe"
+ else
+ print "To stop receiving notifications of this topic, please visit detail link above and unwatch it"
+ }
+ }
+%>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/emailtemplates/default-password-reset.tpl b/server-core/src/main/java/io/onedev/server/model/support/administration/emailtemplates/default-password-reset.tpl
new file mode 100644
index 0000000000..eadb5ab445
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/emailtemplates/default-password-reset.tpl
@@ -0,0 +1,18 @@
+<%
+ if (htmlVersion) {
+ print """
+ Dear ${user.displayName},
+ <p style='margin: 16px 0;'>
+ Per your request, password of account \"${user.name}\" at <a href='${serverUrl}'>${serverUrl}</a> has been reset to:
+ <br><br>
+ ${newPassword}
+ <br><br>
+ Please login and change the password in your earliest convenience.
+ """
+ } else {
+ print "Dear ${user.displayName},\n\n"
+ print "Per your request, password of account \"${user.name}\" at \"${serverUrl}\" has been reset to:\n\n"
+ print newPassword + "\n\n"
+ print "Please login and change the password in your earliest convenience."
+ }
+%>
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/emailtemplates/default-pull-request-notification-unsubscribed.tpl b/server-core/src/main/java/io/onedev/server/model/support/administration/emailtemplates/default-pull-request-notification-unsubscribed.tpl
new file mode 100644
index 0000000000..866fcb7449
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/emailtemplates/default-pull-request-notification-unsubscribed.tpl
@@ -0,0 +1 @@
+You will no longer receive notifications of pull request ${pullRequest.FQN} unless mentioned. However if you subscribed to certain pull request queries, you may still get notifications of newly submitted pull request matching those queries. In this case, you will need to login to your account and unsubscribe those queries.
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/emailtemplates/default-service-desk-issue-open-failed.tpl b/server-core/src/main/java/io/onedev/server/model/support/administration/emailtemplates/default-service-desk-issue-open-failed.tpl
new file mode 100644
index 0000000000..3e21eec62b
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/emailtemplates/default-service-desk-issue-open-failed.tpl
@@ -0,0 +1,25 @@
+<%
+ import org.unbescape.html.HtmlEscape
+
+ if (htmlVersion) {
+ if (exception.message != null) {
+ print """
+ ${HtmlEscape.escapeHtml5(exception.message)}
+ <br>
+ <br>
+ Contact site administrator if necessary
+ """
+ } else {
+ print """
+ Please contact site administrator
+ """
+ }
+ } else {
+ if (exception.message != null) {
+ print "${exception.message}\n\n"
+ print "Contact site administrator if necessary"
+ } else {
+ print "Please contact site administrator"
+ }
+ }
+%>
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/emailtemplates/default-service-desk-issue-opened.tpl b/server-core/src/main/java/io/onedev/server/model/support/administration/emailtemplates/default-service-desk-issue-opened.tpl
new file mode 100644
index 0000000000..463a352305
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/emailtemplates/default-service-desk-issue-opened.tpl
@@ -0,0 +1,6 @@
+<%
+ if (htmlVersion)
+ print "Issue <a href='${issue.url}'>${issue.FQN}</a> is created. You may reply this email to add more comments"
+ else
+ print "Issue ${issue.FQN} is created. You may reply this email to add more comments"
+%>
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/emailtemplates/default-user-invitation.tpl b/server-core/src/main/java/io/onedev/server/model/support/administration/emailtemplates/default-user-invitation.tpl
new file mode 100644
index 0000000000..f0e5a46057
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/emailtemplates/default-user-invitation.tpl
@@ -0,0 +1,16 @@
+<%
+ if (htmlVersion) {
+ print """
+ Hello,
+ <p style='margin: 16px 0;'>
+ You are invited to use OneDev, please visit below link to set up account:
+ <br>
+ <br>
+ <a href='${setupAccountUrl}'>${setupAccountUrl}</a>
+ """
+ } else {
+ print "Hello,\n\n"
+ print "You are invited to use OneDev, please visit below link to set up account:\n\n"
+ print setupAccountUrl
+ }
+%>
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/notificationtemplate/NotificationTemplateSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/notificationtemplate/NotificationTemplateSetting.java
deleted file mode 100644
index d14ed1ade3..0000000000
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/notificationtemplate/NotificationTemplateSetting.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package io.onedev.server.model.support.administration.notificationtemplate;
-
-import java.io.IOException;
-import java.io.Serializable;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.util.List;
-import java.util.Map;
-
-import javax.validation.constraints.Size;
-
-import com.google.common.io.Resources;
-
-import io.onedev.server.annotation.Code;
-import io.onedev.server.annotation.Editable;
-import io.onedev.server.annotation.OmitName;
-
-@Editable
-public class NotificationTemplateSetting implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- public static final List<String> DEFAULT_TEMPLATE;
-
- public static final String PROP_ISSUE_NOTIFICATION_TEMPLATE = "issueNotificationTemplate";
-
- public static final String PROP_PULL_REQUEST_NOTIFICATION_TEMPLATE = "pullRequestNotificationTemplate";
-
- public static final String COMMON_HELP = "Notification template is a "
- + "<a href='https://docs.groovy-lang.org/latest/html/api/groovy/text/SimpleTemplateEngine.html' target='_blank'>Groovy simple template</a>. "
- + "When evaluating this template, below variables will be available:"
- + "<ul class='mb-0'>"
- + "<li><code>event:</code> <a href='https://code.onedev.io/onedev/server/~files/main/server-core/src/main/java/io/onedev/server/event/Event.java' target='_blank'>event object</a> triggering the notification"
- + "<li><code>eventSummary:</code> a string representing summary of the event"
- + "<li><code>eventBody:</code> a string representing body of the event. May be <code>null</code>"
- + "<li><code>eventUrl:</code> a string representing event detail url"
- + "<li><code>replyable:</code> a boolean indiciating whether or not topic comment can be created directly by replying the email"
- + "<li><code>unsubscribable:</code> an <a href='https://code.onedev.io/onedev/server/~files/main/server-core/src/main/java/io/onedev/server/notification/Unsubscribable.java' target='_blank'>object</a> holding unsubscribe information. "
- + " A <code>null</code> value means that the notification can not be unsubscribed";
-
- static {
- URL url = Resources.getResource(NotificationTemplateSetting.class, "default-notification-template.html");
- try {
- DEFAULT_TEMPLATE = Resources.readLines(url, StandardCharsets.UTF_8);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- private List<String> issueNotificationTemplate = DEFAULT_TEMPLATE;
-
- private List<String> pullRequestNotificationTemplate = DEFAULT_TEMPLATE;
-
- @Editable(order=200)
- @Code(language=Code.HTML_TEMPLATE)
- @OmitName
- @Size(min=1, message="May not be empty")
- public List<String> getIssueNotificationTemplate() {
- return issueNotificationTemplate;
- }
-
- public void setIssueNotificationTemplate(List<String> issueNotificationTemplate) {
- this.issueNotificationTemplate = issueNotificationTemplate;
- }
-
- @Editable(order=300)
- @Code(language=Code.HTML_TEMPLATE)
- @OmitName
- @Size(min=1, message="May not be empty")
- public List<String> getPullRequestNotificationTemplate() {
- return pullRequestNotificationTemplate;
- }
-
- public void setPullRequestNotificationTemplate(List<String> pullRequestNotificationTemplate) {
- this.pullRequestNotificationTemplate = pullRequestNotificationTemplate;
- }
-
- public static String getTemplateHelp(Map<String, String> variableHelp) {
- StringBuilder builder = new StringBuilder(COMMON_HELP);
- for (Map.Entry<String, String> entry: variableHelp.entrySet())
- builder.append("<li><code>" + entry.getKey() + ":</code> " + entry.getValue());
- return builder.toString();
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/notificationtemplate/default-notification-template.html b/server-core/src/main/java/io/onedev/server/model/support/administration/notificationtemplate/default-notification-template.html
deleted file mode 100644
index b9b3a6c73b..0000000000
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/notificationtemplate/default-notification-template.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<%
- print "<b>${eventSummary}</b>"
- print "<br><br>"
-
- if (eventBody != null) {
- print eventBody
- print "<br>"
- }
-
- if (replyable)
- print """
- <div>Reply this email to post comment, or click <a href='${eventUrl}'>this link</a> for details</div>
- """
- else
- print """
- <div>Click <a href='${eventUrl}'>this link</a> for details</div>
- """
-%>
-
-<%
- if (unsubscribable != null) {
- print """
- <div style='border-top:1px solid #EEE; margin-top:1em; padding-top:1em; color:#666; font-size:0.9em;'>You received this as you
- are participating in this topic.
- """
- if (unsubscribable.getEmailAddress() != null)
- print """
- Mail to <a href='mailto:${unsubscribable.emailAddress}?subject=Unsubscribe&body=I would like not to get any notifications from this topic'>this address</a> to unsubscribe
- </div>
- """
- else
- print """
- To stop receiving notifications of this topic, please visit detail link above and unwatch it
- </div>
- """
- }
-%>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/field/supply/Ignore.java b/server-core/src/main/java/io/onedev/server/model/support/issue/field/supply/Ignore.java
index 81bc62ad19..3123dd7bba 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/field/supply/Ignore.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/field/supply/Ignore.java
@@ -12,7 +12,7 @@ public class Ignore implements ValueProvider {
private static final long serialVersionUID = 1L;
- public static final String DISPLAY_NAME = "Ignore";
+ public static final String DISPLAY_NAME = "Do not use this field";
@Override
public boolean equals(Object other) {
diff --git a/server-core/src/main/java/io/onedev/server/notification/AbstractNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/AbstractNotificationManager.java
index 858db22b44..0523626a0c 100644
--- a/server-core/src/main/java/io/onedev/server/notification/AbstractNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/AbstractNotificationManager.java
@@ -1,24 +1,19 @@
package io.onedev.server.notification;
-import java.io.IOException;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.annotation.Nullable;
-
-import org.codehaus.groovy.control.CompilationFailedException;
-import org.unbescape.html.HtmlEscape;
-
-import groovy.text.SimpleTemplateEngine;
-import io.onedev.commons.utils.StringUtils;
import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.event.Event;
import io.onedev.server.event.project.issue.IssueEvent;
import io.onedev.server.event.project.pullrequest.PullRequestEvent;
import io.onedev.server.markdown.MarkdownManager;
import io.onedev.server.model.EmailAddress;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.administration.notificationtemplate.NotificationTemplateSetting;
+import io.onedev.server.model.support.administration.emailtemplates.EmailTemplates;
+import org.unbescape.html.HtmlEscape;
+
+import javax.annotation.Nullable;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
public abstract class AbstractNotificationManager {
@@ -31,14 +26,14 @@ public abstract class AbstractNotificationManager {
this.settingManager = settingManager;
}
- protected String getHtmlBody(Object event, String eventSummary, @Nullable String eventBody,
- String eventUrl, boolean replyable, @Nullable Unsubscribable unsubscribable) {
+ protected String getEmailBody(boolean htmlVersion, Event event, String eventSummary, @Nullable String eventBody,
+ String eventUrl, boolean replyable, @Nullable Unsubscribable unsubscribable) {
String template = null;
Map<String, Object> bindings = new HashMap<>();
-
- eventSummary = HtmlEscape.escapeHtml4(eventSummary);
- eventUrl = HtmlEscape.escapeHtml4(eventUrl);
+
+ if (htmlVersion)
+ eventSummary = HtmlEscape.escapeHtml5(eventSummary);
bindings.put("event", event);
bindings.put("eventSummary", eventSummary);
@@ -48,45 +43,16 @@ public abstract class AbstractNotificationManager {
bindings.put("unsubscribable", unsubscribable);
if (event instanceof IssueEvent) {
- template = StringUtils.join(settingManager.getNotificationTemplateSetting().getIssueNotificationTemplate(), "\n");
+ template = settingManager.getEmailTemplates().getIssueNotification();
bindings.put("issue", ((IssueEvent) event).getIssue());
} else if (event instanceof PullRequestEvent) {
- template = StringUtils.join(settingManager.getNotificationTemplateSetting().getPullRequestNotificationTemplate(), "\n");
+ template = settingManager.getEmailTemplates().getPullRequestNotification();
bindings.put("pullRequest", ((PullRequestEvent) event).getRequest());
}
if (template == null)
- template = StringUtils.join(NotificationTemplateSetting.DEFAULT_TEMPLATE, "\n");
+ template = EmailTemplates.DEFAULT_NOTIFICATION;
- try {
- return new SimpleTemplateEngine().createTemplate(template).make(bindings).toString();
- } catch (CompilationFailedException | ClassNotFoundException | IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- protected String getTextBody(Object event, String eventSummary, @Nullable String eventBody,
- String eventUrl, boolean replyable, @Nullable Unsubscribable unsubscribable) {
- StringBuilder textBody = new StringBuilder();
- textBody.append(eventSummary).append("\n\n");
- if (eventBody != null)
- textBody.append(eventBody).append("\n\n");
-
- if (replyable)
- textBody.append("Reply this email to post comment, or visit " + eventUrl + " for details");
- else
- textBody.append("Visit " + eventUrl + " for details");
-
- if (unsubscribable != null) {
- textBody.append("\n\n---------------------------------------------\nYou received this notification as you "
- + "are participating in this topic. ");
- if (unsubscribable.getEmailAddress() != null) {
- textBody.append(String.format("Mail to %s with any content to unsubscribe",
- unsubscribable.getEmailAddress()));
- } else {
- textBody.append("To stop receiving notifications of this topic, please visit detail link above and unwatch it");
- }
- }
- return textBody.toString();
+ return EmailTemplates.evalTemplate(htmlVersion, template, bindings);
}
protected boolean isNotified(Collection<String> notifiedEmailAddresses, User user) {
diff --git a/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java
index 4155c1eacc..019af13426 100644
--- a/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java
@@ -78,8 +78,8 @@ public class BuildNotificationManager extends AbstractNotificationManager {
String url = urlManager.urlFor(build);
String threadingReferences = "<" + build.getProject().getPath() + "-build-" + build.getNumber() + "@onedev>";
- String htmlBody = getHtmlBody(event, summary, null, url, false, null);
- String textBody = getTextBody(event, summary, null, url, false, null);
+ String htmlBody = getEmailBody(true, event, summary, null, url, false, null);
+ String textBody = getEmailBody(false, event, summary, null, url, false, null);
mailManager.sendMailAsync(Lists.newArrayList(), Lists.newArrayList(), emails, subject, htmlBody,
textBody, null, null, threadingReferences);
}
diff --git a/server-core/src/main/java/io/onedev/server/notification/CodeCommentNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/CodeCommentNotificationManager.java
index bca8002753..2ac0e5e5f2 100644
--- a/server-core/src/main/java/io/onedev/server/notification/CodeCommentNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/CodeCommentNotificationManager.java
@@ -1,21 +1,12 @@
package io.onedev.server.notification;
-import java.util.Collection;
-import java.util.HashSet;
-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.server.entitymanager.CodeCommentMentionManager;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.event.Listen;
-import io.onedev.server.event.project.codecomment.CodeCommentEvent;
import io.onedev.server.event.project.codecomment.CodeCommentEdited;
+import io.onedev.server.event.project.codecomment.CodeCommentEvent;
import io.onedev.server.mail.MailManager;
import io.onedev.server.markdown.MarkdownManager;
import io.onedev.server.markdown.MentionParser;
@@ -24,6 +15,13 @@ import io.onedev.server.model.User;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.util.commenttext.MarkdownText;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.stream.Collectors;
+
@Singleton
public class CodeCommentNotificationManager extends AbstractNotificationManager {
@@ -87,8 +85,8 @@ public class CodeCommentNotificationManager extends AbstractNotificationManager
mailManager.sendMailAsync(emailAddresses, Lists.newArrayList(),
Lists.newArrayList(), subject,
- getHtmlBody(event, summary, markdown != null ? markdown.getProcessed() : null, url, false, null),
- getTextBody(event, summary, markdown != null ? markdown.getContent() : null, url, false, null),
+ getEmailBody(true, event, summary, markdown != null ? markdown.getProcessed() : null, url, false, null),
+ getEmailBody(false, event, summary, markdown != null ? markdown.getContent() : null, url, false, null),
null, event.getUser().getDisplayName(), threadingReferences);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/notification/CommitNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/CommitNotificationManager.java
index d9c04440a8..ade63e1233 100644
--- a/server-core/src/main/java/io/onedev/server/notification/CommitNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/CommitNotificationManager.java
@@ -126,8 +126,8 @@ public class CommitNotificationManager extends AbstractNotificationManager {
String threadingReferences = "<commit-" + commit.name() + "@onedev>";
mailManager.sendMailAsync(Lists.newArrayList(), Lists.newArrayList(), notifyEmails, subject,
- getHtmlBody(event, summary, event.getHtmlBody(), url, false, null),
- getTextBody(event, summary, event.getTextBody(), url, false, null),
+ getEmailBody(true, event, summary, event.getHtmlBody(), url, false, null),
+ getEmailBody(false, event, summary, event.getTextBody(), url, false, null),
null, commit.getAuthorIdent().getName(), threadingReferences);
}
}
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.java
index 61bae3b2a3..eddb9dbe04 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
@@ -166,8 +166,8 @@ public class IssueNotificationManager extends AbstractNotificationManager {
if (emailAddress != null && emailAddress.isVerified()) {
mailManager.sendMailAsync(Sets.newHashSet(emailAddress.getValue()),
Lists.newArrayList(), Lists.newArrayList(), subject,
- getHtmlBody(event, summary, event.getHtmlBody(), url, replyable, null),
- getTextBody(event, summary, event.getTextBody(), url, replyable, null),
+ getEmailBody(true, event, summary, event.getHtmlBody(), url, replyable, null),
+ getEmailBody(false, event, summary, event.getTextBody(), url, replyable, null),
replyAddress, senderName, threadingReferences);
}
}
@@ -190,8 +190,8 @@ public class IssueNotificationManager extends AbstractNotificationManager {
if (emailAddress != null && emailAddress.isVerified()) {
mailManager.sendMailAsync(Sets.newHashSet(emailAddress.getValue()),
Lists.newArrayList(), Lists.newArrayList(), subject,
- getHtmlBody(event, summary, event.getHtmlBody(), url, replyable, null),
- getTextBody(event, summary, event.getTextBody(), url, replyable, null),
+ getEmailBody(true, event, summary, event.getHtmlBody(), url, replyable, null),
+ getEmailBody(false, event, summary, event.getTextBody(), url, replyable, null),
replyAddress, senderName, threadingReferences);
}
}
@@ -226,8 +226,8 @@ public class IssueNotificationManager extends AbstractNotificationManager {
if (emailAddress != null && emailAddress.isVerified()) {
mailManager.sendMailAsync(Sets.newHashSet(emailAddress.getValue()),
Sets.newHashSet(), Sets.newHashSet(), subject,
- getHtmlBody(event, summary, event.getHtmlBody(), url, replyable, null),
- getTextBody(event, summary, event.getTextBody(), url, replyable, null),
+ getEmailBody(true, event, summary, event.getHtmlBody(), url, replyable, null),
+ getEmailBody(false, event, summary, event.getTextBody(), url, replyable, null),
replyAddress, senderName, threadingReferences);
}
notifiedUsers.add(mentionedUser);
@@ -256,8 +256,8 @@ public class IssueNotificationManager extends AbstractNotificationManager {
issue.getFQN(), (event instanceof IssueOpened)?"Opened":"Updated", issue.getTitle());
Unsubscribable unsubscribable = new Unsubscribable(mailManager.getUnsubscribeAddress(issue));
- String htmlBody = getHtmlBody(event, summary, event.getHtmlBody(), url, replyable, unsubscribable);
- String textBody = getTextBody(event, summary, event.getTextBody(), url, replyable, unsubscribable);
+ String htmlBody = getEmailBody(true, event, summary, event.getHtmlBody(), url, replyable, unsubscribable);
+ String textBody = getEmailBody(false, event, summary, event.getTextBody(), url, replyable, unsubscribable);
String threadingReferences = issue.getEffectiveThreadingReference();
mailManager.sendMailAsync(Sets.newHashSet(), Sets.newHashSet(),
diff --git a/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java
index d1763f07e2..97ee72f84d 100644
--- a/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java
@@ -184,8 +184,8 @@ public class PullRequestNotificationManager extends AbstractNotificationManager
if (emailAddress != null && emailAddress.isVerified()) {
mailManager.sendMailAsync(Lists.newArrayList(emailAddress.getValue()),
Lists.newArrayList(), Lists.newArrayList(), subject,
- getHtmlBody(event, summary, event.getHtmlBody(), url, replyable, null),
- getTextBody(event, summary, event.getTextBody(), url, replyable, null),
+ getEmailBody(true, event, summary, event.getHtmlBody(), url, replyable, null),
+ getEmailBody(false, event, summary, event.getTextBody(), url, replyable, null),
replyAddress, senderName, threadingReferences);
}
notifiedUsers.add(request.getSubmitter());
@@ -211,8 +211,8 @@ public class PullRequestNotificationManager extends AbstractNotificationManager
if (emailAddress != null && emailAddress.isVerified()) {
mailManager.sendMailAsync(Lists.newArrayList(emailAddress.getValue()),
Lists.newArrayList(), Lists.newArrayList(), subject,
- getHtmlBody(event, assignmentSummary, event.getHtmlBody(), url, replyable, null),
- getTextBody(event, assignmentSummary, event.getTextBody(), url, replyable, null),
+ getEmailBody(true, event, assignmentSummary, event.getHtmlBody(), url, replyable, null),
+ getEmailBody(false, event, assignmentSummary, event.getTextBody(), url, replyable, null),
replyAddress, senderName, threadingReferences);
}
notifiedUsers.add(assignee);
@@ -235,8 +235,8 @@ public class PullRequestNotificationManager extends AbstractNotificationManager
if (emailAddress != null && emailAddress.isVerified()) {
mailManager.sendMailAsync(Lists.newArrayList(emailAddress.getValue()),
Lists.newArrayList(), Lists.newArrayList(), subject,
- getHtmlBody(event, reviewInvitationSummary, event.getHtmlBody(), url, replyable, null),
- getTextBody(event, reviewInvitationSummary, event.getTextBody(), url, replyable, null),
+ getEmailBody(true, event, reviewInvitationSummary, event.getHtmlBody(), url, replyable, null),
+ getEmailBody(false, event, reviewInvitationSummary, event.getTextBody(), url, replyable, null),
replyAddress, senderName, threadingReferences);
}
notifiedUsers.add(reviewer);
@@ -264,8 +264,8 @@ public class PullRequestNotificationManager extends AbstractNotificationManager
if (emailAddress != null && emailAddress.isVerified()) {
mailManager.sendMailAsync(Sets.newHashSet(emailAddress.getValue()),
Sets.newHashSet(), Sets.newHashSet(), subject,
- getHtmlBody(event, summary, event.getHtmlBody(), url, replyable, null),
- getTextBody(event, summary, event.getTextBody(), url, replyable, null),
+ getEmailBody(true, event, summary, event.getHtmlBody(), url, replyable, null),
+ getEmailBody(false, event, summary, event.getTextBody(), url, replyable, null),
replyAddress, senderName, threadingReferences);
}
notifiedUsers.add(mentionedUser);
@@ -297,8 +297,8 @@ public class PullRequestNotificationManager extends AbstractNotificationManager
request.getFQN(), (event instanceof PullRequestOpened) ? "Opened" : "Updated", request.getTitle());
String threadingReferences = "<" + request.getUUID() + "@onedev>";
Unsubscribable unsubscribable = new Unsubscribable(mailManager.getUnsubscribeAddress(request));
- String htmlBody = getHtmlBody(event, summary, event.getHtmlBody(), url, replyable, unsubscribable);
- String textBody = getTextBody(event, summary, event.getTextBody(), url, replyable, unsubscribable);
+ String htmlBody = getEmailBody(true, event, summary, event.getHtmlBody(), url, replyable, unsubscribable);
+ String textBody = getEmailBody(false, event, summary, event.getTextBody(), url, replyable, unsubscribable);
mailManager.sendMailAsync(
Lists.newArrayList(), Lists.newArrayList(),
bccEmailAddresses, subject, htmlBody, textBody,
diff --git a/server-core/src/main/java/io/onedev/server/rest/SettingResource.java b/server-core/src/main/java/io/onedev/server/rest/SettingResource.java
index e60d2bfa99..66d18cd6e2 100644
--- a/server-core/src/main/java/io/onedev/server/rest/SettingResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/SettingResource.java
@@ -31,7 +31,7 @@ import io.onedev.server.model.support.administration.SystemSetting;
import io.onedev.server.model.support.administration.authenticator.Authenticator;
import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;
import io.onedev.server.model.support.administration.mailsetting.MailSetting;
-import io.onedev.server.model.support.administration.notificationtemplate.NotificationTemplateSetting;
+import io.onedev.server.model.support.administration.emailtemplates.EmailTemplates;
import io.onedev.server.model.support.administration.sso.SsoConnector;
import io.onedev.server.rest.annotation.Api;
import io.onedev.server.rest.exception.InvalidParamException;
@@ -136,10 +136,10 @@ public class SettingResource {
@Api(order=900)
@Path("/notification-template")
@GET
- public NotificationTemplateSetting getNotificiationTemplateSetting() {
+ public EmailTemplates getNotificiationTemplateSetting() {
if (!SecurityUtils.isAdministrator())
throw new UnauthorizedException();
- return settingManager.getNotificationTemplateSetting();
+ return settingManager.getEmailTemplates();
}
@Api(order=1000)
@@ -294,10 +294,10 @@ public class SettingResource {
@Api(order=2220)
@Path("/notification-template")
@POST
- public Response setNotificationTemplateSetting(NotificationTemplateSetting notificationTemplateSetting) {
+ public Response setNotificationTemplateSetting(EmailTemplates emailTemplates) {
if (!SecurityUtils.isAdministrator())
throw new UnauthorizedException();
- settingManager.saveNotificationTemplateSetting(notificationTemplateSetting);
+ settingManager.saveEmailTemplates(emailTemplates);
return Response.ok().build();
}
diff --git a/server-core/src/main/java/io/onedev/server/util/GroovyUtils.java b/server-core/src/main/java/io/onedev/server/util/GroovyUtils.java
index d14b003e2e..560f43f167 100644
--- a/server-core/src/main/java/io/onedev/server/util/GroovyUtils.java
+++ b/server-core/src/main/java/io/onedev/server/util/GroovyUtils.java
@@ -4,11 +4,13 @@ import com.google.common.collect.MapMaker;
import groovy.lang.Binding;
import groovy.lang.GroovyClassLoader;
import groovy.lang.Script;
+import groovy.text.SimpleTemplateEngine;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.support.administration.GroovyScript;
+import org.codehaus.groovy.control.CompilationFailedException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -120,4 +122,11 @@ public class GroovyUtils {
return evalScript(scriptContent, new HashMap<>());
}
+ public static String evalTemplate(String template, Map<String, Object> bindings) {
+ try {
+ return new SimpleTemplateEngine().createTemplate(template).make(bindings).toString();
+ } catch (CompilationFailedException | ClassNotFoundException | IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/validation/validator/CodeValidator.java b/server-core/src/main/java/io/onedev/server/validation/validator/CodeValidator.java
index e89a3a8bb5..0122e6b95c 100644
--- a/server-core/src/main/java/io/onedev/server/validation/validator/CodeValidator.java
+++ b/server-core/src/main/java/io/onedev/server/validation/validator/CodeValidator.java
@@ -11,7 +11,7 @@ import groovy.text.SimpleTemplateEngine;
import io.onedev.server.util.GroovyUtils;
import io.onedev.server.annotation.Code;
-public class CodeValidator implements ConstraintValidator<Code, List<String>> {
+public class CodeValidator implements ConstraintValidator<Code, Object> {
private String language;
@@ -24,12 +24,17 @@ public class CodeValidator implements ConstraintValidator<Code, List<String>> {
}
@Override
- public boolean isValid(List<String> value, ConstraintValidatorContext constraintContext) {
- if (value != null && !value.isEmpty()) {
- String joinedValue = StringUtils.join(value, "\n");
- if (language.equals(Code.HTML_TEMPLATE)) {
+ public boolean isValid(Object value, ConstraintValidatorContext constraintContext) {
+ if (value instanceof String && StringUtils.isNotBlank((String)value)
+ || value instanceof List && !((List<?>)value).isEmpty()) {
+ String code;
+ if (value instanceof String)
+ code = (String) value;
+ else
+ code = StringUtils.join((List<String>)value, "\n");
+ if (language.equals(Code.GROOVY_TEMPLATE)) {
try {
- new SimpleTemplateEngine().createTemplate(joinedValue);
+ new SimpleTemplateEngine().createTemplate(code);
} catch (Exception e) {
constraintContext.disableDefaultConstraintViolation();
@@ -37,13 +42,13 @@ public class CodeValidator implements ConstraintValidator<Code, List<String>> {
if (message.length() == 0)
message = e.getMessage();
if (StringUtils.isBlank(message))
- message = "Malformed html template";
+ message = "Malformed groovy template";
constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();
return false;
}
} else if (language.equals(Code.GROOVY)) {
try {
- GroovyUtils.compile(joinedValue);
+ GroovyUtils.compile(code);
} catch (Exception e) {
constraintContext.disableDefaultConstraintViolation();
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.java b/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.java
index db21681d87..a3c618e48e 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.java
@@ -1,8 +1,8 @@
package io.onedev.server.web.behavior.inputassist;
-import java.util.List;
-
-import org.apache.commons.text.StringEscapeUtils;
+import io.onedev.commons.codeassist.InputCompletion;
+import io.onedev.commons.utils.LinearRange;
+import io.onedev.server.web.behavior.infinitescroll.InfiniteScrollBehavior;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.behavior.AttributeAppender;
@@ -10,10 +10,9 @@ import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.markup.repeater.RepeatingView;
+import org.unbescape.html.HtmlEscape;
-import io.onedev.commons.codeassist.InputCompletion;
-import io.onedev.commons.utils.LinearRange;
-import io.onedev.server.web.behavior.infinitescroll.InfiniteScrollBehavior;
+import java.util.List;
@SuppressWarnings("serial")
abstract class AssistPanel extends Panel {
@@ -91,9 +90,9 @@ abstract class AssistPanel extends Panel {
LinearRange match = suggestion.getMatch();
String label = suggestion.getLabel();
if (match != null) {
- String prefix = StringEscapeUtils.escapeHtml4(label.substring(0, match.getFrom()));
- String suffix = StringEscapeUtils.escapeHtml4(label.substring(match.getTo()));
- String matched = StringEscapeUtils.escapeHtml4(label.substring(match.getFrom(), match.getTo()));
+ String prefix = HtmlEscape.escapeHtml5(label.substring(0, match.getFrom()));
+ String suffix = HtmlEscape.escapeHtml5(label.substring(match.getTo()));
+ String matched = HtmlEscape.escapeHtml5(label.substring(match.getFrom(), match.getTo()));
item.add(new Label("content", prefix + "<b>" + matched + "</b>" + suffix).setEscapeModelStrings(false));
} else {
item.add(new Label("content", label));
diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java
index d603e0fc63..e2ba161b29 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java
@@ -1,52 +1,6 @@
package io.onedev.server.web.component.markdown;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.activation.MimetypesFileTypeMap;
-import javax.annotation.Nullable;
-
-import org.apache.commons.fileupload.FileUploadException;
-import org.apache.commons.text.StringEscapeUtils;
-import org.apache.wicket.Component;
-import org.apache.wicket.MetaDataKey;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.ajax.markup.html.form.AjaxButton;
-import org.apache.wicket.feedback.FencedFeedbackPanel;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.form.TextArea;
-import org.apache.wicket.markup.html.form.TextField;
-import org.apache.wicket.markup.html.image.ExternalImage;
-import org.apache.wicket.markup.html.list.ListItem;
-import org.apache.wicket.markup.html.list.ListView;
-import org.apache.wicket.markup.html.panel.Fragment;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.AbstractReadOnlyModel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.model.PropertyModel;
-import org.apache.wicket.protocol.http.WebSession;
-import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.util.lang.Bytes;
-import org.eclipse.jgit.lib.FileMode;
-import org.eclipse.jgit.lib.ObjectId;
-import org.unbescape.javascript.JavaScriptEscape;
-
import com.google.common.base.Preconditions;
-
import io.onedev.commons.utils.PathUtils;
import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
@@ -72,6 +26,40 @@ import io.onedev.server.web.component.tabbable.Tabbable;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
import io.onedev.server.web.util.FileUpload;
+import org.apache.commons.fileupload.FileUploadException;
+import org.apache.wicket.Component;
+import org.apache.wicket.MetaDataKey;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.feedback.FencedFeedbackPanel;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.TextArea;
+import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.markup.html.image.ExternalImage;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.model.*;
+import org.apache.wicket.protocol.http.WebSession;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.util.lang.Bytes;
+import org.eclipse.jgit.lib.FileMode;
+import org.eclipse.jgit.lib.ObjectId;
+import org.unbescape.html.HtmlEscape;
+import org.unbescape.javascript.JavaScriptEscape;
+
+import javax.activation.MimetypesFileTypeMap;
+import javax.annotation.Nullable;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.*;
@SuppressWarnings("serial")
abstract class InsertUrlPanel extends Panel {
@@ -305,7 +293,7 @@ abstract class InsertUrlPanel extends Panel {
}
};
- selectLink.add(new ExternalImage("image", StringEscapeUtils.escapeHtml4(attachmentUrl)));
+ selectLink.add(new ExternalImage("image", HtmlEscape.escapeHtml5(attachmentUrl)));
item.add(selectLink);
item.add(new AjaxLink<Void>("delete") {
@@ -359,7 +347,7 @@ abstract class InsertUrlPanel extends Panel {
}
};
- selectLink.add(new Label("file", StringEscapeUtils.escapeHtml4(attachmentName)));
+ selectLink.add(new Label("file", HtmlEscape.escapeHtml5(attachmentName)));
item.add(selectLink);
item.add(new AjaxLink<Void>("delete") {
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/code/CodeEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/code/CodeEditSupport.java
index c662c91a53..5f6c106baf 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/code/CodeEditSupport.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/code/CodeEditSupport.java
@@ -1,8 +1,10 @@
package io.onedev.server.web.editable.code;
+import java.io.Serializable;
import java.lang.reflect.AnnotatedElement;
import java.util.List;
+import io.onedev.commons.utils.StringUtils;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
@@ -24,17 +26,18 @@ public class CodeEditSupport implements EditSupport {
Class<?> propertyClass = descriptor.getPropertyGetter().getReturnType();
Code annotation = descriptor.getPropertyGetter().getAnnotation(Code.class);
if (annotation != null) {
- if (List.class.isAssignableFrom(propertyClass) && ReflectionUtils.getCollectionElementClass(descriptor.getPropertyGetter().getGenericReturnType()) == String.class) {
- return new PropertyContext<List<String>>(descriptor) {
+ if (propertyClass == String.class || List.class.isAssignableFrom(propertyClass) && ReflectionUtils.getCollectionElementClass(descriptor.getPropertyGetter().getGenericReturnType()) == String.class) {
+ return new PropertyContext<Serializable>(descriptor) {
@Override
- public PropertyViewer renderForView(String componentId, final IModel<List<String>> model) {
+ public PropertyViewer renderForView(String componentId, final IModel<Serializable> model) {
return new PropertyViewer(componentId, descriptor) {
@Override
protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {
- List<String> code = model.getObject();
- if (code != null && !code.isEmpty()) {
+ Serializable modelObject = model.getObject();
+ if (modelObject instanceof String && StringUtils.isNotBlank((String)modelObject)
+ || modelObject instanceof List && !((List<?>) modelObject).isEmpty()) {
return new CodePropertyViewer(id, model.getObject(), annotation.language());
} else {
return new EmptyValueLabel(id) {
@@ -52,13 +55,13 @@ public class CodeEditSupport implements EditSupport {
}
@Override
- public PropertyEditor<List<String>> renderForEdit(String componentId, IModel<List<String>> model) {
+ public PropertyEditor<Serializable> renderForEdit(String componentId, IModel<Serializable> model) {
return new CodePropertyEditor(componentId, descriptor, model);
}
};
} else {
- throw new ExplicitException("@Code annotation should only be applied to a List<String> property");
+ throw new ExplicitException("@Code annotation should be applied to a String or List<String> property");
}
} else {
return null;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyEditor.java
index 674c2be444..41a3fc94bf 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyEditor.java
@@ -1,23 +1,5 @@
package io.onedev.server.web.editable.code;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.wicket.ajax.AjaxChannel;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
-import org.apache.wicket.ajax.attributes.CallbackParameter;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import org.apache.wicket.markup.head.OnLoadHeaderItem;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.form.TextArea;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.request.IRequestParameters;
-import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.util.convert.ConversionException;
-
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
@@ -25,26 +7,43 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
import com.google.common.base.CharMatcher;
import com.google.common.base.Preconditions;
import com.google.common.base.Splitter;
-
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
+import io.onedev.server.annotation.Code;
import io.onedev.server.util.ComponentContext;
import io.onedev.server.util.ReflectionUtils;
-import io.onedev.server.annotation.Code;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
import io.onedev.server.web.behavior.OnTypingDoneBehavior;
import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.PropertyEditor;
+import org.apache.wicket.ajax.AjaxChannel;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
+import org.apache.wicket.ajax.attributes.CallbackParameter;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+import org.apache.wicket.markup.head.OnLoadHeaderItem;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.form.TextArea;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.request.IRequestParameters;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.util.convert.ConversionException;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
@SuppressWarnings("serial")
-public class CodePropertyEditor extends PropertyEditor<List<String>> {
+public class CodePropertyEditor extends PropertyEditor<Serializable> {
private TextArea<String> input;
private AbstractPostAjaxBehavior behavior;
- public CodePropertyEditor(String id, PropertyDescriptor propertyDescriptor, IModel<List<String>> propertyModel) {
+ public CodePropertyEditor(String id, PropertyDescriptor propertyDescriptor, IModel<Serializable> propertyModel) {
super(id, propertyDescriptor, propertyModel);
}
@@ -55,7 +54,11 @@ public class CodePropertyEditor extends PropertyEditor<List<String>> {
WebMarkupContainer container = new WebMarkupContainer("container");
add(container);
- container.add(input = new TextArea<String>("input", Model.of(StringUtils.join(getModelObject(), "\n"))));
+ if (descriptor.getPropertyClass() == String.class)
+ container.add(input = new TextArea<String>("input", Model.of((String)getModelObject())));
+ else
+ container.add(input = new TextArea<String>("input", Model.of(StringUtils.join((List<?>)getModelObject(), "\n"))));
+
input.setLabel(Model.of(getDescriptor().getDisplayName()));
input.setOutputMarkupId(true);
@@ -119,10 +122,21 @@ public class CodePropertyEditor extends PropertyEditor<List<String>> {
}
@Override
- protected List<String> convertInputToValue() throws ConversionException {
- List<String> convertedInput = new ArrayList<>();
- if (input.getConvertedInput() != null)
- convertedInput.addAll(Splitter.on("\n").trimResults(CharMatcher.is('\r')).splitToList(input.getConvertedInput()));
+ protected Serializable convertInputToValue() throws ConversionException {
+ Serializable convertedInput;
+ if (input.getConvertedInput() != null) {
+ if (descriptor.getPropertyClass() == String.class) {
+ convertedInput = input.getConvertedInput();
+ } else {
+ convertedInput = new ArrayList<String>();
+ ((List<String>)convertedInput).addAll(Splitter.on("\n").trimResults(CharMatcher.is('\r')).splitToList(input.getConvertedInput()));
+ }
+ } else {
+ if (descriptor.getPropertyClass() == String.class)
+ convertedInput = null;
+ else
+ convertedInput = new ArrayList<>();
+ }
return convertedInput;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyViewer.java b/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyViewer.java
index 69f20e44f6..d54c70bcb6 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyViewer.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/code/CodePropertyViewer.java
@@ -1,7 +1,6 @@
package io.onedev.server.web.editable.code;
-import java.util.List;
-
+import io.onedev.commons.utils.StringUtils;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.OnLoadHeaderItem;
@@ -9,18 +8,19 @@ import org.apache.wicket.markup.html.form.TextArea;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.Model;
-import io.onedev.commons.utils.StringUtils;
+import java.io.Serializable;
+import java.util.List;
@SuppressWarnings("serial")
public class CodePropertyViewer extends Panel {
- private final List<String> code;
+ private final Serializable code;
private final String language;
private TextArea<String> input;
- public CodePropertyViewer(String id, List<String> code, String language) {
+ public CodePropertyViewer(String id, Serializable code, String language) {
super(id);
this.language = language;
@@ -31,7 +31,11 @@ public class CodePropertyViewer extends Panel {
protected void onInitialize() {
super.onInitialize();
- input = new TextArea<>("input", Model.of(StringUtils.join(code, "\n")));
+ if (code instanceof List)
+ input = new TextArea<>("input", Model.of(StringUtils.join((List<?>)code, "\n")));
+ else
+ input = new TextArea<>("input", Model.of((String)code));
+
add(input);
input.setOutputMarkupId(true);
diff --git a/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java b/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java
index 19541dd5d0..4d39d3ba06 100644
--- a/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java
+++ b/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java
@@ -11,6 +11,7 @@ import io.onedev.server.web.page.admin.buildsetting.agent.AgentLogPage;
import io.onedev.server.web.page.admin.buildsetting.agent.AgentOverviewPage;
import io.onedev.server.web.page.admin.buildsetting.jobexecutor.JobExecutorsPage;
import io.onedev.server.web.page.admin.databasebackup.DatabaseBackupPage;
+import io.onedev.server.web.page.admin.emailtemplates.*;
import io.onedev.server.web.page.admin.gpgsigningkey.GpgSigningKeyPage;
import io.onedev.server.web.page.admin.gpgtrustedkeys.GpgTrustedKeysPage;
import io.onedev.server.web.page.admin.groovyscript.GroovyScriptListPage;
@@ -28,8 +29,6 @@ import io.onedev.server.web.page.admin.issuesetting.statespec.IssueStateListPage
import io.onedev.server.web.page.admin.issuesetting.transitionspec.StateTransitionListPage;
import io.onedev.server.web.page.admin.labelmanagement.LabelManagementPage;
import io.onedev.server.web.page.admin.mailsetting.MailSettingPage;
-import io.onedev.server.web.page.admin.notificationtemplatesetting.IssueNotificationTemplatePage;
-import io.onedev.server.web.page.admin.notificationtemplatesetting.PullRequestNotificationTemplatePage;
import io.onedev.server.web.page.admin.performancesetting.PerformanceSettingPage;
import io.onedev.server.web.page.admin.pluginsettings.ContributedAdministrationSettingPage;
import io.onedev.server.web.page.admin.rolemanagement.NewRolePage;
@@ -249,10 +248,27 @@ public class BaseUrlMapper extends CompoundRequestMapper {
add(new BasePageMapper("~administration/settings/mail", MailSettingPage.class));
add(new BasePageMapper("~administration/settings/service-desk-setting",
ServiceDeskSettingPage.class));
- add(new BasePageMapper("~administration/settings/issue-notification-template",
+ add(new BasePageMapper("~administration/settings/email-templates/issue-notification",
IssueNotificationTemplatePage.class));
- add(new BasePageMapper("~administration/settings/pull-request-notification-template",
+ add(new BasePageMapper("~administration/settings/email-templates/pull-request-notification",
PullRequestNotificationTemplatePage.class));
+ add(new BasePageMapper("~administration/settings/email-templates/issue-notification-unsubscribed",
+ IssueNotificationUnsubscribedTemplatePage.class));
+ add(new BasePageMapper("~administration/settings/email-templates/pull-request-notification-unsubscribed",
+ PullRequestNotificationUnsubscribedTemplatePage.class));
+ add(new BasePageMapper("~administration/settings/email-templates/service-desk-issue-opened",
+ ServiceDeskIssueOpenedTemplatePage.class));
+ add(new BasePageMapper("~administration/settings/email-templates/service-desk-issue-open-failed",
+ ServiceDeskIssueOpenFailedTemplatePage.class));
+ add(new BasePageMapper("~administration/settings/email-templates/user-invitation",
+ UserInvitationTemplatePage.class));
+ add(new BasePageMapper("~administration/settings/email-templates/email-verification",
+ EmailVerificationTemplatePage.class));
+ add(new BasePageMapper("~administration/settings/email-templates/password-reset",
+ PasswordResetTemplatePage.class));
+ add(new BasePageMapper("~administration/settings/email-templates/alert",
+ AlertTemplatePage.class));
+
add(new BasePageMapper("~administration/labels", LabelManagementPage.class));
add(new BasePageMapper("~administration/settings/alert", AlertSettingPage.class));
add(new BasePageMapper("~administration/settings/performance", PerformanceSettingPage.class));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/databasebackup/DatabaseBackupPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/databasebackup/DatabaseBackupPage.html
index 75e3830925..b6638e4adc 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/databasebackup/DatabaseBackupPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/databasebackup/DatabaseBackupPage.html
@@ -7,7 +7,7 @@
<form wicket:id="backupSetting" class="leave-confirm">
<div wicket:id="editor" class="mb-4"></div>
<input type="submit" class="btn btn-primary dirty-aware mr-1" value="Save Settings">
- <a wicket:id="backupNow" class="btn btn-light-primary">Backup now</a>
+ <a wicket:id="backupNow" class="btn btn-light-primary">Backup Now</a>
</form>
</div>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/emailtemplates/AbstractNotificationTemplatePage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/emailtemplates/AbstractNotificationTemplatePage.java
new file mode 100644
index 0000000000..9b77cca4e8
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/emailtemplates/AbstractNotificationTemplatePage.java
@@ -0,0 +1,39 @@
+package io.onedev.server.web.page.admin.emailtemplates;
+
+import io.onedev.server.model.support.administration.emailtemplates.EmailTemplates;
+import io.onedev.server.util.CollectionUtils;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+@SuppressWarnings("serial")
+public abstract class AbstractNotificationTemplatePage extends AbstractTemplatePage {
+
+ public AbstractNotificationTemplatePage(PageParameters params) {
+ super(params);
+ }
+
+ @Override
+ protected String getDefaultTemplate() {
+ return EmailTemplates.DEFAULT_NOTIFICATION;
+ }
+
+ @Override
+ protected String getTemplateHelp(String helpText, Map<String, String> variableHelp) {
+ var currentVaribaleHelp = CollectionUtils.newLinkedHashMap(
+ "event", "<a href='https://code.onedev.io/onedev/server/~files/main/server-core/src/main/java/io/onedev/server/event/Event.java' target='_blank'>event object</a> triggering the notification",
+ "eventSummary", "a string representing summary of the event",
+ "eventBody", "a string representing body of the event. May be <code>null</code>",
+ "eventUrl", "a string representing event detail url",
+ "replyable", "a boolean indiciating whether or not topic comment can be created directly by replying the email",
+ "unsubscribable", "an <a href='https://code.onedev.io/onedev/server/~files/main/server-core/src/main/java/io/onedev/server/notification/Unsubscribable.java' target='_blank'>object</a> holding unsubscribe information. "
+ + " A <code>null</code> value means that the notification can not be unsubscribed"
+ );
+ currentVaribaleHelp.putAll(variableHelp);
+
+ return super.getTemplateHelp(helpText, currentVaribaleHelp);
+ }
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/notificationtemplatesetting/IssueNotificationTemplatePage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/emailtemplates/AbstractTemplatePage.html
similarity index 72%
rename from server-core/src/main/java/io/onedev/server/web/page/admin/notificationtemplatesetting/IssueNotificationTemplatePage.html
rename to server-core/src/main/java/io/onedev/server/web/page/admin/emailtemplates/AbstractTemplatePage.html
index 0721abcfc8..4013809c4c 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/notificationtemplatesetting/IssueNotificationTemplatePage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/emailtemplates/AbstractTemplatePage.html
@@ -1,7 +1,7 @@
<wicket:extend>
- <div class="card issue-notification-template">
+ <div class="card">
<div class="card-body">
- <div wicket:id="notificationTemplateHelp" class="alert alert-notice alert-light mb-5"></div>
+ <div wicket:id="templateHelp" class="alert alert-notice alert-light mb-5"></div>
<form wicket:id="form" class="leave-confirm">
<div wicket:id="editor" class="mb-4"></div>
<input wicket:id="save" type="submit" class="btn btn-primary dirty-aware mr-1" value="Save Template">
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/emailtemplates/AbstractTemplatePage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/emailtemplates/AbstractTemplatePage.java
new file mode 100644
index 0000000000..f8734095d8
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/emailtemplates/AbstractTemplatePage.java
@@ -0,0 +1,132 @@
+package io.onedev.server.web.page.admin.emailtemplates;
+
+import com.google.common.collect.Lists;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.model.support.administration.emailtemplates.EmailTemplates;
+import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
+import io.onedev.server.web.editable.BeanContext;
+import io.onedev.server.web.editable.BeanEditor;
+import io.onedev.server.web.editable.PropertyDescriptor;
+import io.onedev.server.web.page.admin.AdministrationPage;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.Button;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+@SuppressWarnings("serial")
+public abstract class AbstractTemplatePage extends AdministrationPage {
+
+ protected final String GROOVY_TEMPLATE_LINK = "<a href='https://docs.groovy-lang.org/latest/html/api/groovy/text/SimpleTemplateEngine.html' target='_blank'>Groovy simple template</a>";
+
+ public AbstractTemplatePage(PageParameters params) {
+ super(params);
+ }
+
+ private SettingManager getSettingManager() {
+ return OneDev.getInstance(SettingManager.class);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ EmailTemplates templates = getSettingManager().getEmailTemplates();
+ add(new Label("templateHelp", getTemplateHelp(getHelpText(), getVariableHelp()))
+ .setEscapeModelStrings(false));
+
+ BeanEditor editor = BeanContext.edit("editor", templates, Lists.newArrayList(getPropertyName()), false);
+
+ Button saveButton = new Button("save") {
+
+ @Override
+ public void onSubmit() {
+ super.onSubmit();
+
+ getSettingManager().saveEmailTemplates(templates);
+ getSession().success("Template saved");
+ }
+
+ };
+
+ AjaxLink<?> useDefaultLink;
+ add(useDefaultLink = new AjaxLink<Void>("useDefault") {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to use default template?"));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ setTemplate(templates, getDefaultTemplate());
+ getSettingManager().saveEmailTemplates(templates);
+ setResponsePage(getPageClass());
+ }
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ configure();
+ if (!isEnabled())
+ tag.put("disabled", "disabled");
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setEnabled(!getTemplate(templates).equals(getDefaultTemplate()));
+ }
+
+ });
+
+ Form<?> form = new Form<Void>("form");
+ form.add(editor);
+ form.add(saveButton);
+ form.add(useDefaultLink);
+
+ add(form);
+ }
+
+ private String getTemplate(EmailTemplates templates) {
+ return (String) new PropertyDescriptor(EmailTemplates.class, getPropertyName()).getPropertyValue(templates);
+ }
+
+ private void setTemplate(EmailTemplates templates, String template) {
+ new PropertyDescriptor(EmailTemplates.class, getPropertyName()).setPropertyValue(templates, template);
+ }
+
+ protected String getTemplateHelp(String helpText, Map<String, String> variableHelp) {
+ StringBuilder builder = new StringBuilder(helpText);
+ if (!builder.toString().endsWith("."))
+ builder.append(".");
+ builder.append(" When evaluating this template, below variables will be available:<ul class='mb-0'>");
+
+ var currentVariableHelp = new LinkedHashMap<String, String>();
+ currentVariableHelp.put("htmlVersion", "true for html version, false for text version");
+ currentVariableHelp.putAll(variableHelp);
+
+ for (Map.Entry<String, String> entry: currentVariableHelp.entrySet())
+ builder.append("<li><code>" + entry.getKey() + ":</code> " + entry.getValue());
+
+ return builder.append("</ul>").toString();
+ }
+
+ protected abstract String getPropertyName();
+
+ protected abstract String getDefaultTemplate();
+
+ protected abstract String getHelpText();
+
+ protected abstract Map<String, String> getVariableHelp();
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/emailtemplates/AlertTemplatePage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/emailtemplates/AlertTemplatePage.java
new file mode 100644
index 0000000000..2c6b54db61
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/emailtemplates/AlertTemplatePage.java
@@ -0,0 +1,46 @@
+package io.onedev.server.web.page.admin.emailtemplates;
+
+import io.onedev.server.util.CollectionUtils;
+import org.apache.wicket.Component;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import java.util.Map;
+
+import static io.onedev.server.model.support.administration.emailtemplates.EmailTemplates.*;
+
+@SuppressWarnings("serial")
+public class AlertTemplatePage extends AbstractTemplatePage {
+
+ public AlertTemplatePage(PageParameters params) {
+ super(params);
+ }
+
+ @Override
+ protected String getPropertyName() {
+ return PROP_ALERT;
+ }
+
+ @Override
+ protected String getDefaultTemplate() {
+ return DEFAULT_ALERT;
+ }
+
+ @Override
+ protected String getHelpText() {
+ return "A " + GROOVY_TEMPLATE_LINK + " used as body of system alert email";
+ }
+
+ @Override
+ protected Map<String, String> getVariableHelp() {
+ return CollectionUtils.newLinkedHashMap(
+ "alert", "<a href='https://code.onedev.io/onedev/server/~files/main/server-core/src/main/java/io/onedev/server/model/Alert.java'>alert</a> to display",
+ "serverUrl", "root url of OneDev server");
+ }
+
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ return new Label(componentId, "System Alert Template");
+ }
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/emailtemplates/EmailVerificationTemplatePage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/emailtemplates/EmailVerificationTemplatePage.java
new file mode 100644
index 0000000000..fb2fbf7fb2
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/emailtemplates/EmailVerificationTemplatePage.java
@@ -0,0 +1,48 @@
+package io.onedev.server.web.page.admin.emailtemplates;
+
+import io.onedev.server.util.CollectionUtils;
+import org.apache.wicket.Component;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import java.util.Map;
+
+import static io.onedev.server.model.support.administration.emailtemplates.EmailTemplates.*;
+
+@SuppressWarnings("serial")
+public class EmailVerificationTemplatePage extends AbstractTemplatePage {
+
+ public EmailVerificationTemplatePage(PageParameters params) {
+ super(params);
+ }
+
+ @Override
+ protected String getPropertyName() {
+ return PROP_EMAIL_VERIFICATION;
+ }
+
+ @Override
+ protected String getDefaultTemplate() {
+ return DEFAULT_EMAIL_VERIFICATION;
+ }
+
+ @Override
+ protected String getHelpText() {
+ return "A " + GROOVY_TEMPLATE_LINK + " used as body of address verification email";
+ }
+
+ @Override
+ protected Map<String, String> getVariableHelp() {
+ return CollectionUtils.newLinkedHashMap(
+ "user", "<a href=\"https://code.onedev.io/onedev/server/~files/main/server-core/src/main/java/io/onedev/server/model/User.java\">user</a> to verify email for",
+ "emailAddress", "Email address to verify",
+ "serverUrl", "root url of OneDev server",
+ "verificationUrl", "url following which to verify email address");
+ }
+
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ return new Label(componentId, "Email Verification Template");
+ }
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/emailtemplates/IssueNotificationTemplatePage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/emailtemplates/IssueNotificationTemplatePage.java
new file mode 100644
index 0000000000..e919845bbc
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/emailtemplates/IssueNotificationTemplatePage.java
@@ -0,0 +1,40 @@
+package io.onedev.server.web.page.admin.emailtemplates;
+
+import io.onedev.server.util.CollectionUtils;
+import org.apache.wicket.Component;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import java.util.Map;
+
+import static io.onedev.server.model.support.administration.emailtemplates.EmailTemplates.PROP_ISSUE_NOTIFICATION;
+
+@SuppressWarnings("serial")
+public class IssueNotificationTemplatePage extends AbstractNotificationTemplatePage {
+
+ public IssueNotificationTemplatePage(PageParameters params) {
+ super(params);
+ }
+
+ @Override
+ protected String getPropertyName() {
+ return PROP_ISSUE_NOTIFICATION;
+ }
+
+ @Override
+ protected String getHelpText() {
+ return "A " + GROOVY_TEMPLATE_LINK + " used as body of various issue notification emails";
+ }
+
+ @Override
+ protected Map<String, String> getVariableHelp() {
+ return CollectionUtils.newLinkedHashMap("issue",
+ "represents the <a href='https://code.onedev.io/onedev/server/~files/main/server-core/src/main/java/io/onedev/server/model/Issue.java' target='_blank'>issue</a> object to be notified");
+ }
+
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ return new Label(componentId, "Issue Notification Template");
+ }
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/emailtemplates/IssueNotificationUnsubscribedTemplatePage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/emailtemplates/IssueNotificationUnsubscribedTemplatePage.java
new file mode 100644
index 0000000000..10aae45058
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/emailtemplates/IssueNotificationUnsubscribedTemplatePage.java
@@ -0,0 +1,47 @@
+package io.onedev.server.web.page.admin.emailtemplates;
+
+import io.onedev.server.util.CollectionUtils;
+import org.apache.wicket.Component;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import java.util.List;
+import java.util.Map;
+
+import static io.onedev.server.model.support.administration.emailtemplates.EmailTemplates.*;
+
+@SuppressWarnings("serial")
+public class IssueNotificationUnsubscribedTemplatePage extends AbstractTemplatePage {
+
+ public IssueNotificationUnsubscribedTemplatePage(PageParameters params) {
+ super(params);
+ }
+
+ @Override
+ protected String getPropertyName() {
+ return PROP_ISSUE_NOTIFICATION_UNSUBSCRIBED;
+ }
+
+ @Override
+ protected String getDefaultTemplate() {
+ return DEFAULT_ISSUE_NOTIFICATION_UNSUBSCRIBED;
+ }
+
+ @Override
+ protected String getHelpText() {
+ return "A " + GROOVY_TEMPLATE_LINK + " used as body of feedback email when unsubscribed " +
+ "from issue notification";
+ }
+
+ @Override
+ protected Map<String, String> getVariableHelp() {
+ return CollectionUtils.newLinkedHashMap("issue",
+ "represents the unsubscribed <a href='https://code.onedev.io/onedev/server/~files/main/server-core/src/main/java/io/onedev/server/model/Issue.java' target='_blank'>issue</a>");
+ }
+
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ return new Label(componentId, "Issue Notification Unsubscribed Template");
+ }
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/emailtemplates/PasswordResetTemplatePage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/emailtemplates/PasswordResetTemplatePage.java
new file mode 100644
index 0000000000..e0b07fbe07
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/emailtemplates/PasswordResetTemplatePage.java
@@ -0,0 +1,47 @@
+package io.onedev.server.web.page.admin.emailtemplates;
+
+import io.onedev.server.util.CollectionUtils;
+import org.apache.wicket.Component;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import java.util.Map;
+
+import static io.onedev.server.model.support.administration.emailtemplates.EmailTemplates.*;
+
+@SuppressWarnings("serial")
+public class PasswordResetTemplatePage extends AbstractTemplatePage {
+
+ public PasswordResetTemplatePage(PageParameters params) {
+ super(params);
+ }
+
+ @Override
+ protected String getPropertyName() {
+ return PROP_PASSWORD_RESET;
+ }
+
+ @Override
+ protected String getDefaultTemplate() {
+ return DEFAULT_PASSWORD_RESET;
+ }
+
+ @Override
+ protected String getHelpText() {
+ return "A " + GROOVY_TEMPLATE_LINK + " used as body of password reset email";
+ }
+
+ @Override
+ protected Map<String, String> getVariableHelp() {
+ return CollectionUtils.newLinkedHashMap(
+ "user", "<a href=\"https://code.onedev.io/onedev/server/~files/main/server-core/src/main/java/io/onedev/server/model/User.java\">user</a> to reset password for",
+ "serverUrl", "root url of OneDev server",
+ "newPassword", "new password");
+ }
+
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ return new Label(componentId, "Password Reset Template");
+ }
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/emailtemplates/PullRequestNotificationTemplatePage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/emailtemplates/PullRequestNotificationTemplatePage.java
new file mode 100644
index 0000000000..46d4375474
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/emailtemplates/PullRequestNotificationTemplatePage.java
@@ -0,0 +1,40 @@
+package io.onedev.server.web.page.admin.emailtemplates;
+
+import io.onedev.server.util.CollectionUtils;
+import org.apache.wicket.Component;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import java.util.Map;
+
+import static io.onedev.server.model.support.administration.emailtemplates.EmailTemplates.PROP_PULL_REQUEST_NOTIFICATION;
+
+@SuppressWarnings("serial")
+public class PullRequestNotificationTemplatePage extends AbstractNotificationTemplatePage {
+
+ public PullRequestNotificationTemplatePage(PageParameters params) {
+ super(params);
+ }
+
+ @Override
+ protected String getPropertyName() {
+ return PROP_PULL_REQUEST_NOTIFICATION;
+ }
+
+ @Override
+ protected String getHelpText() {
+ return "A " + GROOVY_TEMPLATE_LINK + " used as body of various pull request notification emails";
+ }
+
+ @Override
+ protected Map<String, String> getVariableHelp() {
+ return CollectionUtils.newLinkedHashMap("pullRequest",
+ "represents the <a href='https://code.onedev.io/onedev/server/~files/main/server-core/src/main/java/io/onedev/server/model/PullRequest.java' target='_blank'>pull request</a> object to be notified");
+ }
+
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ return new Label(componentId, "Pull Request Notification Template");
+ }
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/emailtemplates/PullRequestNotificationUnsubscribedTemplatePage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/emailtemplates/PullRequestNotificationUnsubscribedTemplatePage.java
new file mode 100644
index 0000000000..a8ee49cafd
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/emailtemplates/PullRequestNotificationUnsubscribedTemplatePage.java
@@ -0,0 +1,48 @@
+package io.onedev.server.web.page.admin.emailtemplates;
+
+import io.onedev.server.util.CollectionUtils;
+import org.apache.wicket.Component;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import java.util.List;
+import java.util.Map;
+
+import static io.onedev.server.model.support.administration.emailtemplates.EmailTemplates.DEFAULT_PULL_REQUEST_NOTIFICATION_UNSUBSCRIBED;
+import static io.onedev.server.model.support.administration.emailtemplates.EmailTemplates.PROP_PULL_REQUEST_NOTIFICATION_UNSUBSCRIBED;
+
+@SuppressWarnings("serial")
+public class PullRequestNotificationUnsubscribedTemplatePage extends AbstractTemplatePage {
+
+ public PullRequestNotificationUnsubscribedTemplatePage(PageParameters params) {
+ super(params);
+ }
+
+ @Override
+ protected String getPropertyName() {
+ return PROP_PULL_REQUEST_NOTIFICATION_UNSUBSCRIBED;
+ }
+
+ @Override
+ protected String getDefaultTemplate() {
+ return DEFAULT_PULL_REQUEST_NOTIFICATION_UNSUBSCRIBED;
+ }
+
+ @Override
+ protected String getHelpText() {
+ return "A " + GROOVY_TEMPLATE_LINK + " used as body of feedback email when unsubscribed " +
+ "from pull request notification";
+ }
+
+ @Override
+ protected Map<String, String> getVariableHelp() {
+ return CollectionUtils.newLinkedHashMap("pullRequest",
+ "represents the unsubscribed <a href='https://code.onedev.io/onedev/server/~files/main/server-core/src/main/java/io/onedev/server/model/PullRequest.java' target='_blank'>pull request</a>");
+ }
+
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ return new Label(componentId, "Pull Request Notification Unsubscribed Template");
+ }
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/emailtemplates/ServiceDeskIssueOpenFailedTemplatePage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/emailtemplates/ServiceDeskIssueOpenFailedTemplatePage.java
new file mode 100644
index 0000000000..39530793f9
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/emailtemplates/ServiceDeskIssueOpenFailedTemplatePage.java
@@ -0,0 +1,47 @@
+package io.onedev.server.web.page.admin.emailtemplates;
+
+import io.onedev.server.util.CollectionUtils;
+import org.apache.wicket.Component;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import java.util.List;
+import java.util.Map;
+
+import static io.onedev.server.model.support.administration.emailtemplates.EmailTemplates.*;
+
+@SuppressWarnings("serial")
+public class ServiceDeskIssueOpenFailedTemplatePage extends AbstractTemplatePage {
+
+ public ServiceDeskIssueOpenFailedTemplatePage(PageParameters params) {
+ super(params);
+ }
+
+ @Override
+ protected String getPropertyName() {
+ return PROP_SERVICE_DESK_ISSUE_OPEN_FAILED;
+ }
+
+ @Override
+ protected String getDefaultTemplate() {
+ return DEFAULT_SERVICE_DESK_ISSUE_OPEN_FAILED;
+ }
+
+ @Override
+ protected String getHelpText() {
+ return "A " + GROOVY_TEMPLATE_LINK + " used as body of feedback email when failed to open issue " +
+ "via service desk";
+ }
+
+ @Override
+ protected Map<String, String> getVariableHelp() {
+ return CollectionUtils.newLinkedHashMap("exception",
+ "represents the exception encountered when open issue via service desk");
+ }
+
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ return new Label(componentId, "Service Desk Issue Open Failed Template");
+ }
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/emailtemplates/ServiceDeskIssueOpenedTemplatePage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/emailtemplates/ServiceDeskIssueOpenedTemplatePage.java
new file mode 100644
index 0000000000..fb29517c10
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/emailtemplates/ServiceDeskIssueOpenedTemplatePage.java
@@ -0,0 +1,48 @@
+package io.onedev.server.web.page.admin.emailtemplates;
+
+import io.onedev.server.util.CollectionUtils;
+import org.apache.wicket.Component;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import java.util.List;
+import java.util.Map;
+
+import static io.onedev.server.model.support.administration.emailtemplates.EmailTemplates.DEFAULT_SERVICE_DESK_ISSUE_OPENED;
+import static io.onedev.server.model.support.administration.emailtemplates.EmailTemplates.PROP_SERVICE_DESK_ISSUE_OPENED;
+
+@SuppressWarnings("serial")
+public class ServiceDeskIssueOpenedTemplatePage extends AbstractTemplatePage {
+
+ public ServiceDeskIssueOpenedTemplatePage(PageParameters params) {
+ super(params);
+ }
+
+ @Override
+ protected String getPropertyName() {
+ return PROP_SERVICE_DESK_ISSUE_OPENED;
+ }
+
+ @Override
+ protected String getDefaultTemplate() {
+ return DEFAULT_SERVICE_DESK_ISSUE_OPENED;
+ }
+
+ @Override
+ protected String getHelpText() {
+ return "A " + GROOVY_TEMPLATE_LINK + " used as body of feedback email when issue is opened " +
+ "via service desk";
+ }
+
+ @Override
+ protected Map<String, String> getVariableHelp() {
+ return CollectionUtils.newLinkedHashMap("issue",
+ "represents the <a href='https://code.onedev.io/onedev/server/~files/main/server-core/src/main/java/io/onedev/server/model/Issue.java' target='_blank'>issue</a> being opened via service desk");
+ }
+
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ return new Label(componentId, "Service Desk Issue Opened Template");
+ }
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/emailtemplates/UserInvitationTemplatePage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/emailtemplates/UserInvitationTemplatePage.java
new file mode 100644
index 0000000000..a165a83758
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/emailtemplates/UserInvitationTemplatePage.java
@@ -0,0 +1,44 @@
+package io.onedev.server.web.page.admin.emailtemplates;
+
+import io.onedev.server.util.CollectionUtils;
+import org.apache.wicket.Component;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import java.util.Map;
+
+import static io.onedev.server.model.support.administration.emailtemplates.EmailTemplates.*;
+
+@SuppressWarnings("serial")
+public class UserInvitationTemplatePage extends AbstractTemplatePage {
+
+ public UserInvitationTemplatePage(PageParameters params) {
+ super(params);
+ }
+
+ @Override
+ protected String getPropertyName() {
+ return PROP_USER_INVITATION;
+ }
+
+ @Override
+ protected String getDefaultTemplate() {
+ return DEFAULT_USER_INVITATION;
+ }
+
+ @Override
+ protected String getHelpText() {
+ return "A " + GROOVY_TEMPLATE_LINK + " used as body of user invitation email";
+ }
+
+ @Override
+ protected Map<String, String> getVariableHelp() {
+ return CollectionUtils.newLinkedHashMap("setupAccountUrl", "the url to set up user account");
+ }
+
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ return new Label(componentId, "User Invitation Template");
+ }
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/notificationtemplatesetting/IssueNotificationTemplatePage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/notificationtemplatesetting/IssueNotificationTemplatePage.java
deleted file mode 100644
index 06f53b6290..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/notificationtemplatesetting/IssueNotificationTemplatePage.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package io.onedev.server.web.page.admin.notificationtemplatesetting;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.form.Button;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
-import com.google.common.collect.Lists;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.model.support.administration.notificationtemplate.NotificationTemplateSetting;
-import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
-import io.onedev.server.web.editable.BeanContext;
-import io.onedev.server.web.editable.BeanEditor;
-import io.onedev.server.web.page.admin.AdministrationPage;
-
-@SuppressWarnings("serial")
-public class IssueNotificationTemplatePage extends AdministrationPage {
-
- public IssueNotificationTemplatePage(PageParameters params) {
- super(params);
- }
-
- private SettingManager getSettingManager() {
- return OneDev.getInstance(SettingManager.class);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- NotificationTemplateSetting setting = getSettingManager().getNotificationTemplateSetting();
-
- Map<String, String> variableHelp = new LinkedHashMap<>();
- variableHelp.put("issue", " represents the <a href='https://code.onedev.io/onedev/server/~files/main/server-core/src/main/java/io/onedev/server/model/Issue.java' target='_blank'>issue</a> object to be notified");
- add(new Label("notificationTemplateHelp", NotificationTemplateSetting.getTemplateHelp(variableHelp))
- .setEscapeModelStrings(false));
-
- BeanEditor editor = BeanContext.edit("editor", setting, Lists.newArrayList(NotificationTemplateSetting.PROP_ISSUE_NOTIFICATION_TEMPLATE), false);
-
- Button saveButton = new Button("save") {
-
- @Override
- public void onSubmit() {
- super.onSubmit();
-
- getSettingManager().saveNotificationTemplateSetting(setting);
- getSession().success("Issue notification template has been saved");
- }
-
- };
-
- AjaxLink<?> useDefaultLink;
- add(useDefaultLink = new AjaxLink<Void>("useDefault") {
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to use default template?"));
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- setting.setIssueNotificationTemplate(NotificationTemplateSetting.DEFAULT_TEMPLATE);
- getSettingManager().saveNotificationTemplateSetting(setting);
- setResponsePage(IssueNotificationTemplatePage.class);
- }
-
- @Override
- protected void onComponentTag(ComponentTag tag) {
- super.onComponentTag(tag);
- configure();
- if (!isEnabled())
- tag.put("disabled", "disabled");
- }
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setEnabled(!setting.getIssueNotificationTemplate().equals(NotificationTemplateSetting.DEFAULT_TEMPLATE));
- }
-
- });
-
- Form<?> form = new Form<Void>("form");
- form.add(editor);
- form.add(saveButton);
- form.add(useDefaultLink);
-
- add(form);
- }
-
- @Override
- protected Component newTopbarTitle(String componentId) {
- return new Label(componentId, "Issue Notification Template");
- }
-
-}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/notificationtemplatesetting/PullRequestNotificationTemplatePage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/notificationtemplatesetting/PullRequestNotificationTemplatePage.html
deleted file mode 100644
index 611140e9fe..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/notificationtemplatesetting/PullRequestNotificationTemplatePage.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<wicket:extend>
- <div class="card pull-request-notification-template">
- <div class="card-body">
- <div wicket:id="notificationTemplateHelp" class="alert alert-notice alert-light mb-5"></div>
- <form wicket:id="form" class="leave-confirm">
- <div wicket:id="editor" class="mb-4"></div>
- <input wicket:id="save" type="submit" class="btn btn-primary dirty-aware mr-1" value="Save Template">
- <input wicket:id="useDefault" type="button" class="btn btn-light-primary" value="Use Default">
- </form>
- </div>
- </div>
-</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/notificationtemplatesetting/PullRequestNotificationTemplatePage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/notificationtemplatesetting/PullRequestNotificationTemplatePage.java
deleted file mode 100644
index ed28503bad..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/notificationtemplatesetting/PullRequestNotificationTemplatePage.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package io.onedev.server.web.page.admin.notificationtemplatesetting;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.form.Button;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
-import com.google.common.collect.Lists;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.model.support.administration.notificationtemplate.NotificationTemplateSetting;
-import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
-import io.onedev.server.web.editable.BeanContext;
-import io.onedev.server.web.editable.BeanEditor;
-import io.onedev.server.web.page.admin.AdministrationPage;
-
-@SuppressWarnings("serial")
-public class PullRequestNotificationTemplatePage extends AdministrationPage {
-
- public PullRequestNotificationTemplatePage(PageParameters params) {
- super(params);
- }
-
- private SettingManager getSettingManager() {
- return OneDev.getInstance(SettingManager.class);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- NotificationTemplateSetting setting = getSettingManager().getNotificationTemplateSetting();
-
- Map<String, String> variableHelp = new LinkedHashMap<>();
- variableHelp.put("pullRequest", " represents the <a href='https://code.onedev.io/onedev/server/~files/main/server-core/src/main/java/io/onedev/server/model/PullRequest.java' target='_blank'>pull request</a> object to be notified");
- add(new Label("notificationTemplateHelp", NotificationTemplateSetting.getTemplateHelp(variableHelp))
- .setEscapeModelStrings(false));
-
- BeanEditor editor = BeanContext.edit("editor", setting, Lists.newArrayList(NotificationTemplateSetting.PROP_PULL_REQUEST_NOTIFICATION_TEMPLATE), false);
-
- Button saveButton = new Button("save") {
-
- @Override
- public void onSubmit() {
- super.onSubmit();
-
- getSettingManager().saveNotificationTemplateSetting(setting);
- getSession().success("Issue notification template has been saved");
- }
-
- };
-
- AjaxLink<?> useDefaultLink;
- add(useDefaultLink = new AjaxLink<Void>("useDefault") {
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to use default template?"));
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- setting.setPullRequestNotificationTemplate(NotificationTemplateSetting.DEFAULT_TEMPLATE);
- getSettingManager().saveNotificationTemplateSetting(setting);
- setResponsePage(PullRequestNotificationTemplatePage.class);
- }
-
- @Override
- protected void onComponentTag(ComponentTag tag) {
- super.onComponentTag(tag);
- configure();
- if (!isEnabled())
- tag.put("disabled", "disabled");
- }
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setEnabled(!setting.getPullRequestNotificationTemplate().equals(NotificationTemplateSetting.DEFAULT_TEMPLATE));
- }
-
- });
-
- Form<?> form = new Form<Void>("form");
- form.add(editor);
- form.add(saveButton);
- form.add(useDefaultLink);
-
- add(form);
- }
-
- @Override
- protected Component newTopbarTitle(String componentId) {
- return new Label(componentId, "Pull Request Notification Template");
- }
-
-}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
index 6d9aaa5456..258e99c6a8 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
@@ -2,7 +2,6 @@ package io.onedev.server.web.page.layout;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
-import com.hazelcast.cluster.Cluster;
import io.onedev.commons.loader.AppLoader;
import io.onedev.commons.loader.Plugin;
import io.onedev.server.FeatureManager;
@@ -36,6 +35,7 @@ import io.onedev.server.web.page.admin.buildsetting.agent.AgentDetailPage;
import io.onedev.server.web.page.admin.buildsetting.agent.AgentListPage;
import io.onedev.server.web.page.admin.buildsetting.jobexecutor.JobExecutorsPage;
import io.onedev.server.web.page.admin.databasebackup.DatabaseBackupPage;
+import io.onedev.server.web.page.admin.emailtemplates.*;
import io.onedev.server.web.page.admin.gpgsigningkey.GpgSigningKeyPage;
import io.onedev.server.web.page.admin.gpgtrustedkeys.GpgTrustedKeysPage;
import io.onedev.server.web.page.admin.groovyscript.GroovyScriptListPage;
@@ -51,8 +51,6 @@ import io.onedev.server.web.page.admin.issuesetting.statespec.IssueStateListPage
import io.onedev.server.web.page.admin.issuesetting.transitionspec.StateTransitionListPage;
import io.onedev.server.web.page.admin.labelmanagement.LabelManagementPage;
import io.onedev.server.web.page.admin.mailsetting.MailSettingPage;
-import io.onedev.server.web.page.admin.notificationtemplatesetting.IssueNotificationTemplatePage;
-import io.onedev.server.web.page.admin.notificationtemplatesetting.PullRequestNotificationTemplatePage;
import io.onedev.server.web.page.admin.performancesetting.PerformanceSettingPage;
import io.onedev.server.web.page.admin.pluginsettings.ContributedAdministrationSettingPage;
import io.onedev.server.web.page.admin.rolemanagement.NewRolePage;
@@ -232,14 +230,33 @@ public abstract class LayoutPage extends BasePage {
administrationMenuItems.add(new SidebarMenuItem.Page(null, "Service Desk Settings",
ServiceDeskSettingPage.class, new PageParameters()));
- List<SidebarMenuItem> notificationTemplateSettingMenuItems = new ArrayList<>();
- notificationTemplateSettingMenuItems.add(new SidebarMenuItem.Page(null, "Issue",
+ List<SidebarMenuItem> emailTemplatesMenuItems = new ArrayList<>();
+ emailTemplatesMenuItems.add(new SidebarMenuItem.Page(null, "Issue Notification",
IssueNotificationTemplatePage.class, new PageParameters()));
- notificationTemplateSettingMenuItems.add(new SidebarMenuItem.Page(null, "Pull Request",
+ emailTemplatesMenuItems.add(new SidebarMenuItem.Page(null, "Pull Request Notification",
PullRequestNotificationTemplatePage.class, new PageParameters()));
- administrationMenuItems.add(new SidebarMenuItem.SubMenu(null, "Notification Templates",
- notificationTemplateSettingMenuItems));
+ emailTemplatesMenuItems.add(new SidebarMenuItem.Page(null, "Issue Notification Unsubscribed",
+ IssueNotificationUnsubscribedTemplatePage.class, new PageParameters()));
+ emailTemplatesMenuItems.add(new SidebarMenuItem.Page(null, "Pull Request Notification Unsubscribed",
+ PullRequestNotificationUnsubscribedTemplatePage.class, new PageParameters()));
+
+ emailTemplatesMenuItems.add(new SidebarMenuItem.Page(null, "Service Desk Issue Opened",
+ ServiceDeskIssueOpenedTemplatePage.class, new PageParameters()));
+ emailTemplatesMenuItems.add(new SidebarMenuItem.Page(null, "Service Desk Issue Open Failed",
+ ServiceDeskIssueOpenFailedTemplatePage.class, new PageParameters()));
+
+ emailTemplatesMenuItems.add(new SidebarMenuItem.Page(null, "User Invitation",
+ UserInvitationTemplatePage.class, new PageParameters()));
+ emailTemplatesMenuItems.add(new SidebarMenuItem.Page(null, "Email Verification",
+ EmailVerificationTemplatePage.class, new PageParameters()));
+ emailTemplatesMenuItems.add(new SidebarMenuItem.Page(null, "Password Reset",
+ PasswordResetTemplatePage.class, new PageParameters()));
+ emailTemplatesMenuItems.add(new SidebarMenuItem.Page(null, "System Alert",
+ AlertTemplatePage.class, new PageParameters()));
+
+ administrationMenuItems.add(new SidebarMenuItem.SubMenu(null, "Email Templates",
+ emailTemplatesMenuItems));
administrationMenuItems.add(new SidebarMenuItem.Page(null, "Alert Settings",
AlertSettingPage.class, new PageParameters()));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/security/PasswordResetPage.java b/server-core/src/main/java/io/onedev/server/web/page/simple/security/PasswordResetPage.java
index 0b52250445..85004f2bdd 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/simple/security/PasswordResetPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/security/PasswordResetPage.java
@@ -10,6 +10,7 @@ import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.mail.MailManager;
import io.onedev.server.model.EmailAddress;
import io.onedev.server.model.User;
+import io.onedev.server.model.support.administration.emailtemplates.EmailTemplates;
import io.onedev.server.persistence.SessionManager;
import io.onedev.server.util.CryptoUtils;
import io.onedev.server.web.component.taskbutton.TaskButton;
@@ -25,6 +26,8 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
@SuppressWarnings("serial")
public class PasswordResetPage extends SimplePage {
@@ -87,20 +90,15 @@ public class PasswordResetPage extends SimplePage {
userManager.update(user, null);
MailManager mailManager = OneDev.getInstance(MailManager.class);
-
- String serverUrl = settingManager.getSystemSetting().getServerUrl();
-
- String htmlBody = String.format("Dear %s, "
- + "<p style='margin: 16px 0;'>"
- + "Per your request, password of your login \"%s\" at <a href=\"%s\">%s</a> has been reset to:<br>"
- + "%s<br><br>"
- + "Please login and change the password in your earliest convenience.",
- user.getDisplayName(), user.getName(), serverUrl, serverUrl, password);
-
- String textBody = String.format("Dear %s,\n\n"
- + "Per your request, password of account \"%s\" at %s has been reset to:\n"
- + "%s",
- user.getDisplayName(), user.getName(), serverUrl, password);
+
+ Map<String, Object> bindings = new HashMap<>();
+ bindings.put("serverUrl", settingManager.getSystemSetting().getServerUrl());
+ bindings.put("user", user);
+ bindings.put("newPassword", password);
+
+ var template = settingManager.getEmailTemplates().getPasswordReset();
+ var htmlBody = EmailTemplates.evalTemplate(true, template, bindings);
+ var textBody = EmailTemplates.evalTemplate(false, template, bindings);
String emailAddressValue;
if (loginNameOrEmail.contains("@")) {