Skip to content

The Unified and Autonomous Development Platform

Improve email notification as well as service desk feature

Robin Shenf7f34f349353
diff --git a/pom.xml b/pom.xml
index fd8c04fa88..b7dcae98ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -267,7 +267,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
- <version>1.19</version>
+ <version>1.21</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
@@ -502,7 +502,7 @@
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-core</artifactId>
- <version>2.2.0</version>
+ <version>2.7.0</version>
</dependency>
<dependency>
<groupId>org.json</groupId>
@@ -558,12 +558,12 @@
</repository>
</repositories>
<properties>
- <commons.version>2.0.11</commons.version>
- <k8shelper.version>2.1.6</k8shelper.version>
+ <commons.version>2.0.12</commons.version>
+ <k8shelper.version>2.1.7</k8shelper.version>
<slf4j.version>1.7.5</slf4j.version>
<logback.version>1.2.0</logback.version>
<antlr.version>4.7.2</antlr.version>
- <jetty.version>9.4.37.v20210219</jetty.version>
+ <jetty.version>9.4.43.v20210629</jetty.version>
<wicket.version>7.17.0</wicket.version>
<jersey.version>2.26</jersey.version>
<hibernate.version>5.4.9.Final</hibernate.version>
diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.java
index 5d73850bda..599344c562 100644
--- a/server-core/src/main/java/io/onedev/server/CoreModule.java
+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java
@@ -165,6 +165,8 @@ import io.onedev.server.entitymanager.impl.DefaultSettingManager;
import io.onedev.server.entitymanager.impl.DefaultSshKeyManager;
import io.onedev.server.entitymanager.impl.DefaultUserAuthorizationManager;
import io.onedev.server.entitymanager.impl.DefaultUserManager;
+import io.onedev.server.entityreference.DefaultEntityReferenceManager;
+import io.onedev.server.entityreference.EntityReferenceManager;
import io.onedev.server.git.GitFilter;
import io.onedev.server.git.GitSshCommandCreator;
import io.onedev.server.git.config.GitConfig;
@@ -185,6 +187,9 @@ import io.onedev.server.maintenance.DefaultDataManager;
import io.onedev.server.maintenance.ResetAdminPassword;
import io.onedev.server.maintenance.RestoreDatabase;
import io.onedev.server.maintenance.Upgrade;
+import io.onedev.server.markdown.DefaultMarkdownManager;
+import io.onedev.server.markdown.MarkdownManager;
+import io.onedev.server.markdown.MarkdownProcessor;
import io.onedev.server.model.Build;
import io.onedev.server.model.support.administration.GroovyScript;
import io.onedev.server.model.support.administration.authenticator.Authenticator;
@@ -250,10 +255,6 @@ import io.onedev.server.util.jackson.git.GitObjectMapperConfigurator;
import io.onedev.server.util.jackson.hibernate.HibernateObjectMapperConfigurator;
import io.onedev.server.util.jetty.DefaultJettyLauncher;
import io.onedev.server.util.jetty.JettyLauncher;
-import io.onedev.server.util.markdown.DefaultMarkdownManager;
-import io.onedev.server.util.markdown.EntityReferenceManager;
-import io.onedev.server.util.markdown.MarkdownManager;
-import io.onedev.server.util.markdown.MarkdownProcessor;
import io.onedev.server.util.schedule.DefaultTaskScheduler;
import io.onedev.server.util.schedule.TaskScheduler;
import io.onedev.server.util.script.ScriptContribution;
@@ -288,8 +289,8 @@ import io.onedev.server.web.editable.EditSupport;
import io.onedev.server.web.editable.EditSupportLocator;
import io.onedev.server.web.editable.EditSupportRegistry;
import io.onedev.server.web.mapper.DynamicPathPageMapper;
-import io.onedev.server.web.page.layout.ContributedAdministrationSetting;
import io.onedev.server.web.page.layout.AdministrationSettingContribution;
+import io.onedev.server.web.page.layout.ContributedAdministrationSetting;
import io.onedev.server.web.page.layout.DefaultMainMenuCustomization;
import io.onedev.server.web.page.layout.MainMenuCustomization;
import io.onedev.server.web.page.project.blob.render.BlobRendererContribution;
@@ -385,7 +386,6 @@ public class CoreModule extends AbstractPluginModule {
bind(CommitNotificationManager.class);
bind(BuildNotificationManager.class);
bind(IssueNotificationManager.class);
- bind(EntityReferenceManager.class);
bind(CodeCommentNotificationManager.class);
bind(CodeCommentManager.class).to(DefaultCodeCommentManager.class);
bind(IssueWatchManager.class).to(DefaultIssueWatchManager.class);
@@ -405,6 +405,7 @@ public class CoreModule extends AbstractPluginModule {
bind(PullRequestAssignmentManager.class).to(DefaultPullRequestAssignmentManager.class);
bind(SshKeyManager.class).to(DefaultSshKeyManager.class);
bind(BuildMetricManager.class).to(DefaultBuildMetricManager.class);
+ bind(EntityReferenceManager.class).to(DefaultEntityReferenceManager.class);
bind(WebHookManager.class);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/IssueChangeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/IssueChangeManager.java
index 9a7d4fea9f..7a95786b8f 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/IssueChangeManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/IssueChangeManager.java
@@ -17,8 +17,6 @@ public interface IssueChangeManager extends EntityManager<IssueChange> {
void changeTitle(Issue issue, String title);
- void changeDescription(Issue issue, @Nullable String description);
-
void changeMilestone(Issue issue, Milestone milestone);
void changeFields(Issue issue, Map<String, Object> fieldValues);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.java
index e773c169ac..627ad1759b 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.java
@@ -58,6 +58,9 @@ public interface IssueManager extends EntityManager<Issue> {
void fixFieldValueOrders();
+ void saveDescription(Issue issue, @Nullable String description);
+
+ @Override
void delete(Issue issue);
Collection<Long> getIssueNumbers(Long projectId);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestChangeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestChangeManager.java
index 1b7b0982f1..78b3f427f4 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestChangeManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestChangeManager.java
@@ -1,7 +1,5 @@
package io.onedev.server.entitymanager;
-import javax.annotation.Nullable;
-
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestChange;
import io.onedev.server.model.support.pullrequest.MergeStrategy;
@@ -13,6 +11,4 @@ public interface PullRequestChangeManager extends EntityManager<PullRequestChang
void changeTitle(PullRequest request, String title);
- void changeDescription(PullRequest request, @Nullable String description);
-
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java
index 4dfba1bcc7..403821d56b 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java
@@ -73,4 +73,6 @@ public interface PullRequestManager extends EntityManager<PullRequest> {
void delete(Collection<PullRequest> requests);
+ void saveDescription(PullRequest request, @Nullable String description);
+
}
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 89e7baf934..46e6beb7a8 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
@@ -124,6 +124,7 @@ public interface SettingManager extends EntityManager<Setting> {
void saveNotificationTemplateSetting(NotificationTemplateSetting notificationTemplateSetting);
+ @Nullable
ServiceDeskSetting getServiceDeskSetting();
void saveServiceDeskSetting(ServiceDeskSetting serviceDeskSetting);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java
index baa7b412ab..2baffb1eed 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java
@@ -57,7 +57,6 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.support.issue.TransitionSpec;
import io.onedev.server.model.support.issue.changedata.IssueBatchUpdateData;
-import io.onedev.server.model.support.issue.changedata.IssueDescriptionChangeData;
import io.onedev.server.model.support.issue.changedata.IssueFieldChangeData;
import io.onedev.server.model.support.issue.changedata.IssueMilestoneChangeData;
import io.onedev.server.model.support.issue.changedata.IssueStateChangeData;
@@ -161,22 +160,6 @@ public class DefaultIssueChangeManager extends BaseEntityManager<IssueChange>
}
}
- @Transactional
- @Override
- public void changeDescription(Issue issue, @Nullable String description) {
- String prevDescription = issue.getDescription();
- if (!Objects.equal(description, prevDescription)) {
- issue.setDescription(description);
-
- IssueChange change = new IssueChange();
- change.setIssue(issue);
- change.setDate(new Date());
- change.setUser(SecurityUtils.getUser());
- change.setData(new IssueDescriptionChangeData(prevDescription, issue.getDescription()));
- save(change);
- }
- }
-
@Transactional
@Override
public void changeMilestone(Issue issue, @Nullable Milestone milestone) {
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
index 55ea65a585..1583bd9907 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
@@ -22,6 +22,7 @@ import javax.persistence.criteria.JoinType;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
+import org.apache.wicket.util.lang.Objects;
import org.hibernate.Session;
import org.hibernate.criterion.MatchMode;
import org.hibernate.criterion.Order;
@@ -44,6 +45,9 @@ import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.entitymanager.RoleManager;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.entitymanager.UserManager;
+import io.onedev.server.entityreference.EntityReferenceManager;
+import io.onedev.server.entityreference.ReferenceMigrator;
+import io.onedev.server.entityreference.ReferencedFromAware;
import io.onedev.server.event.entity.EntityRemoved;
import io.onedev.server.event.issue.IssueChangeEvent;
import io.onedev.server.event.issue.IssueEvent;
@@ -61,9 +65,6 @@ import io.onedev.server.model.support.administration.GlobalIssueSetting;
import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.SpecifiedChoices;
import io.onedev.server.model.support.issue.NamedIssueQuery;
import io.onedev.server.model.support.issue.changedata.IssueChangeData;
-import io.onedev.server.model.support.issue.changedata.IssueReferencedFromCodeCommentData;
-import io.onedev.server.model.support.issue.changedata.IssueReferencedFromIssueData;
-import io.onedev.server.model.support.issue.changedata.IssueReferencedFromPullRequestData;
import io.onedev.server.model.support.issue.field.spec.FieldSpec;
import io.onedev.server.persistence.TransactionManager;
import io.onedev.server.persistence.annotation.Sessional;
@@ -82,7 +83,6 @@ import io.onedev.server.storage.AttachmentStorageManager;
import io.onedev.server.util.MilestoneAndState;
import io.onedev.server.util.Pair;
import io.onedev.server.util.ProjectScopedNumber;
-import io.onedev.server.util.ReferenceMigrator;
import io.onedev.server.util.facade.IssueFacade;
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;
@@ -112,6 +112,8 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
private final TransactionManager transactionManager;
+ private final EntityReferenceManager entityReferenceManager;
+
private final RoleManager roleManager;
private final Map<Long, IssueFacade> cache = new HashMap<>();
@@ -124,7 +126,7 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
SettingManager settingManager, ListenerRegistry listenerRegistry,
ProjectManager projectManager, UserManager userManager,
RoleManager roleManager, AttachmentStorageManager attachmentStorageManager,
- IssueCommentManager issueCommentManager) {
+ IssueCommentManager issueCommentManager, EntityReferenceManager entityReferenceManager) {
super(dao);
this.issueFieldManager = issueFieldManager;
this.issueQuerySettingManager = issueQuerySettingManager;
@@ -136,6 +138,7 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
this.roleManager = roleManager;
this.attachmentStorageManager = attachmentStorageManager;
this.issueCommentManager = issueCommentManager;
+ this.entityReferenceManager = entityReferenceManager;
}
@SuppressWarnings("unchecked")
@@ -303,11 +306,8 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
boolean minorChange = false;
if (event instanceof IssueChangeEvent) {
IssueChangeData changeData = ((IssueChangeEvent)event).getChange().getData();
- if (changeData instanceof IssueReferencedFromCodeCommentData
- || changeData instanceof IssueReferencedFromIssueData
- || changeData instanceof IssueReferencedFromPullRequestData) {
+ if (changeData instanceof ReferencedFromAware)
minorChange = true;
- }
}
if (!(event instanceof IssueOpened || minorChange))
@@ -808,7 +808,18 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
});
}
-
+
+ @Transactional
+ @Override
+ public void saveDescription(Issue issue, @Nullable String description) {
+ String prevDescription = issue.getDescription();
+ if (!Objects.equal(description, prevDescription)) {
+ issue.setDescription(description);
+ entityReferenceManager.addReferenceChange(issue, description);
+ save(issue);
+ }
+ }
+
@Transactional
@Override
public void delete(Collection<Issue> issues) {
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestChangeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestChangeManager.java
index b09ed5db12..55290a8929 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestChangeManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestChangeManager.java
@@ -2,19 +2,15 @@ package io.onedev.server.entitymanager.impl;
import java.util.Date;
-import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
-import com.google.common.base.Objects;
-
import io.onedev.commons.launcher.loader.ListenerRegistry;
import io.onedev.server.entitymanager.PullRequestChangeManager;
import io.onedev.server.event.pullrequest.PullRequestChangeEvent;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestChange;
import io.onedev.server.model.support.pullrequest.MergeStrategy;
-import io.onedev.server.model.support.pullrequest.changedata.PullRequestDescriptionChangeData;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestMergeStrategyChangeData;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestTitleChangeData;
import io.onedev.server.persistence.annotation.Transactional;
@@ -69,20 +65,4 @@ public class DefaultPullRequestChangeManager extends BaseEntityManager<PullReque
}
}
- @Transactional
- @Override
- public void changeDescription(PullRequest request, @Nullable String description) {
- String prevDescription = request.getDescription();
- if (!Objects.equal(prevDescription, description)) {
- request.setDescription(description);
-
- PullRequestChange change = new PullRequestChange();
- change.setDate(new Date());
- change.setRequest(request);
- change.setData(new PullRequestDescriptionChangeData(prevDescription, description));
- change.setUser(SecurityUtils.getUser());
- save(change);
- }
- }
-
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
index b6436dd7f7..106a971e14 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
@@ -31,6 +31,7 @@ import javax.persistence.criteria.CriteriaQuery;
import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
+import org.apache.wicket.util.lang.Objects;
import org.eclipse.jgit.lib.CommitBuilder;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.ObjectInserter;
@@ -65,6 +66,8 @@ import io.onedev.server.entitymanager.PullRequestChangeManager;
import io.onedev.server.entitymanager.PullRequestManager;
import io.onedev.server.entitymanager.PullRequestReviewManager;
import io.onedev.server.entitymanager.PullRequestUpdateManager;
+import io.onedev.server.entityreference.EntityReferenceManager;
+import io.onedev.server.entityreference.ReferencedFromAware;
import io.onedev.server.event.RefUpdated;
import io.onedev.server.event.build.BuildEvent;
import io.onedev.server.event.entity.EntityRemoved;
@@ -77,6 +80,7 @@ import io.onedev.server.event.pullrequest.PullRequestOpened;
import io.onedev.server.event.pullrequest.PullRequestUpdated;
import io.onedev.server.git.GitUtils;
import io.onedev.server.infomanager.CommitInfoManager;
+import io.onedev.server.markdown.MarkdownManager;
import io.onedev.server.model.Build;
import io.onedev.server.model.Group;
import io.onedev.server.model.Project;
@@ -99,9 +103,6 @@ import io.onedev.server.model.support.pullrequest.changedata.PullRequestChangeDa
import io.onedev.server.model.support.pullrequest.changedata.PullRequestDiscardData;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestMergeData;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestMergeStrategyChangeData;
-import io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromCodeCommentData;
-import io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromIssueData;
-import io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromPullRequestData;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestReopenData;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestReviewerAddData;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestReviewerRemoveData;
@@ -123,7 +124,6 @@ import io.onedev.server.security.permission.ReadCode;
import io.onedev.server.util.ProjectAndBranch;
import io.onedev.server.util.ProjectScopedNumber;
import io.onedev.server.util.concurrent.Prioritized;
-import io.onedev.server.util.markdown.MarkdownManager;
import io.onedev.server.util.reviewrequirement.ReviewRequirement;
import io.onedev.server.util.work.BatchWorkManager;
import io.onedev.server.util.work.BatchWorker;
@@ -159,6 +159,8 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> im
private final ExecutorService executorService;
+ private final EntityReferenceManager entityReferenceManager;
+
@Inject
public DefaultPullRequestManager(Dao dao, PullRequestUpdateManager pullRequestUpdateManager,
PullRequestReviewManager pullRequestReviewManager, MarkdownManager markdownManager,
@@ -166,7 +168,8 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> im
SessionManager sessionManager, PullRequestChangeManager pullRequestChangeManager,
ExecutorService executorService, BuildManager buildManager,
TransactionManager transactionManager, ProjectManager projectManager,
- CommitInfoManager commitInfoManager, PullRequestAssignmentManager pullRequestAssignmentManager) {
+ CommitInfoManager commitInfoManager, PullRequestAssignmentManager pullRequestAssignmentManager,
+ EntityReferenceManager entityReferenceManager) {
super(dao);
this.pullRequestUpdateManager = pullRequestUpdateManager;
@@ -181,6 +184,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> im
this.projectManager = projectManager;
this.commitInfoManager = commitInfoManager;
this.pullRequestAssignmentManager = pullRequestAssignmentManager;
+ this.entityReferenceManager = entityReferenceManager;
}
@Transactional
@@ -660,9 +664,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> im
|| changeData instanceof PullRequestAssigneeRemoveData
|| changeData instanceof PullRequestSourceBranchDeleteData
|| changeData instanceof PullRequestSourceBranchRestoreData
- || changeData instanceof PullRequestReferencedFromCodeCommentData
- || changeData instanceof PullRequestReferencedFromIssueData
- || changeData instanceof PullRequestReferencedFromPullRequestData) {
+ || changeData instanceof ReferencedFromAware) {
minorChange = true;
}
}
@@ -1034,4 +1036,15 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> im
delete(request);
}
+ @Transactional
+ @Override
+ public void saveDescription(PullRequest request, @Nullable String description) {
+ String prevDescription = request.getDescription();
+ if (!Objects.equal(description, prevDescription)) {
+ request.setDescription(description);
+ entityReferenceManager.addReferenceChange(request, description);
+ save(request);
+ }
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/util/markdown/BuildProcessor.java b/server-core/src/main/java/io/onedev/server/entityreference/BuildProcessor.java
similarity index 93%
rename from server-core/src/main/java/io/onedev/server/util/markdown/BuildProcessor.java
rename to server-core/src/main/java/io/onedev/server/entityreference/BuildProcessor.java
index 58c53350c9..66a965fa57 100644
--- a/server-core/src/main/java/io/onedev/server/util/markdown/BuildProcessor.java
+++ b/server-core/src/main/java/io/onedev/server/entityreference/BuildProcessor.java
@@ -1,4 +1,4 @@
-package io.onedev.server.util.markdown;
+package io.onedev.server.entityreference;
import javax.annotation.Nullable;
@@ -8,6 +8,7 @@ import org.unbescape.html.HtmlEscape;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.BuildManager;
+import io.onedev.server.markdown.MarkdownProcessor;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
import io.onedev.server.util.ProjectScopedNumber;
diff --git a/server-core/src/main/java/io/onedev/server/util/markdown/EntityReferenceManager.java b/server-core/src/main/java/io/onedev/server/entityreference/DefaultEntityReferenceManager.java
similarity index 88%
rename from server-core/src/main/java/io/onedev/server/util/markdown/EntityReferenceManager.java
rename to server-core/src/main/java/io/onedev/server/entityreference/DefaultEntityReferenceManager.java
index 931a095464..d51858df15 100644
--- a/server-core/src/main/java/io/onedev/server/util/markdown/EntityReferenceManager.java
+++ b/server-core/src/main/java/io/onedev/server/entityreference/DefaultEntityReferenceManager.java
@@ -1,4 +1,4 @@
-package io.onedev.server.util.markdown;
+package io.onedev.server.entityreference;
import java.util.Date;
@@ -17,10 +17,9 @@ import io.onedev.server.entitymanager.PullRequestManager;
import io.onedev.server.event.codecomment.CodeCommentCreated;
import io.onedev.server.event.codecomment.CodeCommentUpdated;
import io.onedev.server.event.entity.EntityPersisted;
-import io.onedev.server.event.issue.IssueChangeEvent;
import io.onedev.server.event.issue.IssueOpened;
-import io.onedev.server.event.pullrequest.PullRequestChangeEvent;
import io.onedev.server.event.pullrequest.PullRequestOpened;
+import io.onedev.server.markdown.MarkdownManager;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.CodeCommentReply;
import io.onedev.server.model.Issue;
@@ -29,15 +28,11 @@ import io.onedev.server.model.IssueComment;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestChange;
import io.onedev.server.model.PullRequestComment;
-import io.onedev.server.model.support.issue.changedata.IssueDescriptionChangeData;
-import io.onedev.server.model.support.issue.changedata.IssueTitleChangeData;
-import io.onedev.server.model.support.pullrequest.changedata.PullRequestDescriptionChangeData;
-import io.onedev.server.model.support.pullrequest.changedata.PullRequestTitleChangeData;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.util.ProjectScopedNumber;
@Singleton
-public class EntityReferenceManager {
+public class DefaultEntityReferenceManager implements EntityReferenceManager {
private final IssueChangeManager issueChangeManager;
@@ -46,14 +41,15 @@ public class EntityReferenceManager {
private final MarkdownManager markdownManager;
@Inject
- public EntityReferenceManager(IssueChangeManager issueChangeManager,
+ public DefaultEntityReferenceManager(IssueChangeManager issueChangeManager,
PullRequestChangeManager pullRequestChangeManager, MarkdownManager markdownManager) {
this.issueChangeManager = issueChangeManager;
this.pullRequestChangeManager = pullRequestChangeManager;
this.markdownManager = markdownManager;
}
- private void addReferenceChange(Issue issue, String markdown) {
+ @Override
+ public void addReferenceChange(Issue issue, String markdown) {
if (markdown != null) {
Document document = Jsoup.parseBodyFragment(markdownManager.render(markdown));
for (ProjectScopedNumber referencedIssueFQN: new ReferenceParser(Issue.class).parseReferences(document, issue.getProject())) {
@@ -111,7 +107,8 @@ public class EntityReferenceManager {
}
}
- private void addReferenceChange(PullRequest request, String markdown) {
+ @Override
+ public void addReferenceChange(PullRequest request, String markdown) {
if (markdown != null) {
Document document = Jsoup.parseBodyFragment(markdownManager.render(markdown));
for (ProjectScopedNumber referencedIssueFQN: new ReferenceParser(Issue.class).parseReferences(document, request.getTargetProject())) {
@@ -169,7 +166,8 @@ public class EntityReferenceManager {
}
}
- private void addReferenceChange(CodeComment comment, String markdown) {
+ @Override
+ public void addReferenceChange(CodeComment comment, String markdown) {
if (markdown != null) {
Document document = Jsoup.parseBodyFragment(markdownManager.render(markdown));
for (ProjectScopedNumber referencedIssueFQN: new ReferenceParser(Issue.class).parseReferences(document, comment.getProject())) {
@@ -257,15 +255,6 @@ public class EntityReferenceManager {
addReferenceChange(event.getRequest(), event.getRequest().getDescription());
}
- @Transactional
- @Listen
- public void on(PullRequestChangeEvent event) {
- if (event.getChange().getData() instanceof PullRequestTitleChangeData)
- addReferenceChange(event.getRequest(), event.getRequest().getTitle());
- if (event.getChange().getData() instanceof PullRequestDescriptionChangeData)
- addReferenceChange(event.getRequest(), event.getRequest().getDescription());
- }
-
@Transactional
@Listen
public void on(IssueOpened event) {
@@ -273,15 +262,6 @@ public class EntityReferenceManager {
addReferenceChange(event.getIssue(), event.getIssue().getDescription());
}
- @Transactional
- @Listen
- public void on(IssueChangeEvent event) {
- if (event.getChange().getData() instanceof IssueTitleChangeData)
- addReferenceChange(event.getIssue(), event.getIssue().getTitle());
- if (event.getChange().getData() instanceof IssueDescriptionChangeData)
- addReferenceChange(event.getIssue(), event.getIssue().getDescription());
- }
-
@Transactional
@Listen
public void on(CodeCommentCreated event) {
diff --git a/server-core/src/main/java/io/onedev/server/entityreference/EntityReferenceManager.java b/server-core/src/main/java/io/onedev/server/entityreference/EntityReferenceManager.java
new file mode 100644
index 0000000000..c6121fd61f
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/entityreference/EntityReferenceManager.java
@@ -0,0 +1,17 @@
+package io.onedev.server.entityreference;
+
+import javax.annotation.Nullable;
+
+import io.onedev.server.model.CodeComment;
+import io.onedev.server.model.Issue;
+import io.onedev.server.model.PullRequest;
+
+public interface EntityReferenceManager {
+
+ void addReferenceChange(Issue issue, @Nullable String markdown);
+
+ void addReferenceChange(PullRequest request, @Nullable String markdown);
+
+ void addReferenceChange(CodeComment comment, @Nullable String markdown);
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/util/markdown/IssueProcessor.java b/server-core/src/main/java/io/onedev/server/entityreference/IssueProcessor.java
similarity index 92%
rename from server-core/src/main/java/io/onedev/server/util/markdown/IssueProcessor.java
rename to server-core/src/main/java/io/onedev/server/entityreference/IssueProcessor.java
index 7f77de7918..a5950da2cf 100644
--- a/server-core/src/main/java/io/onedev/server/util/markdown/IssueProcessor.java
+++ b/server-core/src/main/java/io/onedev/server/entityreference/IssueProcessor.java
@@ -1,10 +1,11 @@
-package io.onedev.server.util.markdown;
+package io.onedev.server.entityreference;
import javax.annotation.Nullable;
import org.apache.wicket.request.cycle.RequestCycle;
import org.jsoup.nodes.Document;
+import io.onedev.server.markdown.MarkdownProcessor;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.util.ProjectScopedNumber;
diff --git a/server-core/src/main/java/io/onedev/server/util/markdown/PullRequestProcessor.java b/server-core/src/main/java/io/onedev/server/entityreference/PullRequestProcessor.java
similarity index 92%
rename from server-core/src/main/java/io/onedev/server/util/markdown/PullRequestProcessor.java
rename to server-core/src/main/java/io/onedev/server/entityreference/PullRequestProcessor.java
index ecdceefc1e..282c7ab4dd 100644
--- a/server-core/src/main/java/io/onedev/server/util/markdown/PullRequestProcessor.java
+++ b/server-core/src/main/java/io/onedev/server/entityreference/PullRequestProcessor.java
@@ -1,10 +1,11 @@
-package io.onedev.server.util.markdown;
+package io.onedev.server.entityreference;
import javax.annotation.Nullable;
import org.apache.wicket.request.cycle.RequestCycle;
import org.jsoup.nodes.Document;
+import io.onedev.server.markdown.MarkdownProcessor;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.util.ProjectScopedNumber;
diff --git a/server-core/src/main/java/io/onedev/server/util/ReferenceMigrator.java b/server-core/src/main/java/io/onedev/server/entityreference/ReferenceMigrator.java
similarity index 97%
rename from server-core/src/main/java/io/onedev/server/util/ReferenceMigrator.java
rename to server-core/src/main/java/io/onedev/server/entityreference/ReferenceMigrator.java
index 92609c67be..cbfa166cde 100644
--- a/server-core/src/main/java/io/onedev/server/util/ReferenceMigrator.java
+++ b/server-core/src/main/java/io/onedev/server/entityreference/ReferenceMigrator.java
@@ -1,4 +1,4 @@
-package io.onedev.server.util;
+package io.onedev.server.entityreference;
import java.util.Map;
diff --git a/server-core/src/main/java/io/onedev/server/util/markdown/ReferenceParser.java b/server-core/src/main/java/io/onedev/server/entityreference/ReferenceParser.java
similarity index 97%
rename from server-core/src/main/java/io/onedev/server/util/markdown/ReferenceParser.java
rename to server-core/src/main/java/io/onedev/server/entityreference/ReferenceParser.java
index 06c10abd13..fcbb5a1412 100644
--- a/server-core/src/main/java/io/onedev/server/util/markdown/ReferenceParser.java
+++ b/server-core/src/main/java/io/onedev/server/entityreference/ReferenceParser.java
@@ -1,4 +1,4 @@
-package io.onedev.server.util.markdown;
+package io.onedev.server.entityreference;
import java.util.Collection;
import java.util.HashSet;
@@ -14,13 +14,13 @@ import org.jsoup.select.NodeTraversor;
import com.google.common.collect.ImmutableSet;
-import io.onedev.commons.utils.HtmlUtils;
import io.onedev.commons.utils.StringUtils;
import io.onedev.commons.utils.WordUtils;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.AbstractEntity;
import io.onedev.server.model.Project;
+import io.onedev.server.util.HtmlUtils;
import io.onedev.server.util.ProjectScopedNumber;
import io.onedev.server.util.TextNodeVisitor;
import io.onedev.server.util.validation.ProjectNameValidator;
diff --git a/server-core/src/main/java/io/onedev/server/util/Referenceable.java b/server-core/src/main/java/io/onedev/server/entityreference/Referenceable.java
similarity index 89%
rename from server-core/src/main/java/io/onedev/server/util/Referenceable.java
rename to server-core/src/main/java/io/onedev/server/entityreference/Referenceable.java
index 26b9d607c5..ba688c933e 100644
--- a/server-core/src/main/java/io/onedev/server/util/Referenceable.java
+++ b/server-core/src/main/java/io/onedev/server/entityreference/Referenceable.java
@@ -1,4 +1,4 @@
-package io.onedev.server.util;
+package io.onedev.server.entityreference;
import io.onedev.server.model.Project;
diff --git a/server-core/src/main/java/io/onedev/server/entityreference/ReferencedFromAware.java b/server-core/src/main/java/io/onedev/server/entityreference/ReferencedFromAware.java
new file mode 100644
index 0000000000..4fdf9e52fd
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/entityreference/ReferencedFromAware.java
@@ -0,0 +1,12 @@
+package io.onedev.server.entityreference;
+
+import javax.annotation.Nullable;
+
+import io.onedev.server.model.AbstractEntity;
+
+public interface ReferencedFromAware<T extends AbstractEntity> {
+
+ @Nullable
+ T getReferencedFrom();
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/event/MarkdownAware.java b/server-core/src/main/java/io/onedev/server/event/MarkdownAware.java
deleted file mode 100644
index 8179fa078c..0000000000
--- a/server-core/src/main/java/io/onedev/server/event/MarkdownAware.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package io.onedev.server.event;
-
-import javax.annotation.Nullable;
-
-public interface MarkdownAware {
- @Nullable String getMarkdown();
-}
diff --git a/server-core/src/main/java/io/onedev/server/event/ProjectEvent.java b/server-core/src/main/java/io/onedev/server/event/ProjectEvent.java
index 88ff4bfe3f..357dd855af 100644
--- a/server-core/src/main/java/io/onedev/server/event/ProjectEvent.java
+++ b/server-core/src/main/java/io/onedev/server/event/ProjectEvent.java
@@ -1,15 +1,25 @@
package io.onedev.server.event;
import java.util.Date;
+import java.util.Optional;
+import javax.annotation.Nullable;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.markdown.MarkdownManager;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.model.support.LastUpdate;
+import io.onedev.server.notification.ActivityDetail;
public abstract class ProjectEvent extends Event {
private final Project project;
+ private transient Optional<String> renderedMarkdown;
+
+ private transient Optional<String> processedMarkdown;
+
public ProjectEvent(User user, Date date, Project project) {
super(user, date);
this.project = project;
@@ -21,6 +31,16 @@ public abstract class ProjectEvent extends Event {
public abstract String getActivity();
+ @Nullable
+ public String getMarkdown() {
+ return null;
+ }
+
+ @Nullable
+ public ActivityDetail getActivityDetail() {
+ return null;
+ }
+
public LastUpdate getLastUpdate() {
LastUpdate lastUpdate = new LastUpdate();
lastUpdate.setUser(getUser());
@@ -28,5 +48,61 @@ public abstract class ProjectEvent extends Event {
lastUpdate.setDate(getDate());
return lastUpdate;
}
+
+ @Nullable
+ public String getRenderedMarkdown() {
+ if (renderedMarkdown == null) {
+ String markdown = getMarkdown();
+ if (markdown != null)
+ renderedMarkdown = Optional.of(OneDev.getInstance(MarkdownManager.class).render(markdown));
+ else
+ renderedMarkdown = Optional.empty();
+ }
+ return renderedMarkdown.orElse(null);
+ }
+
+ @Nullable
+ public String getProcessedMarkdown() {
+ if (processedMarkdown == null) {
+ String renderedMarkdown = getRenderedMarkdown();
+ if (renderedMarkdown != null) {
+ processedMarkdown = Optional.of(OneDev.getInstance(MarkdownManager.class)
+ .process(renderedMarkdown, getProject(), null, true));
+ } else {
+ processedMarkdown = Optional.empty();
+ }
+ }
+ return processedMarkdown.orElse(null);
+ }
+
+ @Nullable
+ public String getTextBody() {
+ ActivityDetail activityDetail = getActivityDetail();
+ String markdown = getMarkdown();
+
+ if (activityDetail != null && markdown != null)
+ return activityDetail.getTextVersion() + "\n\n" + markdown;
+ else if (activityDetail != null)
+ return activityDetail.getTextVersion();
+ else if (markdown != null)
+ return markdown;
+ else
+ return null;
+ }
+
+ @Nullable
+ public String getHtmlBody() {
+ ActivityDetail activityDetail = getActivityDetail();
+ String processedMarkdown = getProcessedMarkdown();
+ if (activityDetail != null && processedMarkdown != null)
+ return activityDetail.getHtmlVersion() + "<br>" + processedMarkdown;
+ else if (activityDetail != null)
+ return activityDetail.getHtmlVersion();
+ else if (processedMarkdown != null)
+ return processedMarkdown;
+ else
+ return null;
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentCreated.java b/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentCreated.java
index 48bab58250..8240e2aa67 100644
--- a/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentCreated.java
+++ b/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentCreated.java
@@ -1,9 +1,8 @@
package io.onedev.server.event.codecomment;
-import io.onedev.server.event.MarkdownAware;
import io.onedev.server.model.CodeComment;
-public class CodeCommentCreated extends CodeCommentEvent implements MarkdownAware {
+public class CodeCommentCreated extends CodeCommentEvent {
public CodeCommentCreated(CodeComment comment) {
super(comment.getUser(), comment.getCreateDate(), comment);
diff --git a/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentReplied.java b/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentReplied.java
index 6cc084d840..eb1e706935 100644
--- a/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentReplied.java
+++ b/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentReplied.java
@@ -1,9 +1,8 @@
package io.onedev.server.event.codecomment;
-import io.onedev.server.event.MarkdownAware;
import io.onedev.server.model.CodeCommentReply;
-public class CodeCommentReplied extends CodeCommentEvent implements MarkdownAware {
+public class CodeCommentReplied extends CodeCommentEvent {
private final CodeCommentReply reply;
diff --git a/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentUpdated.java b/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentUpdated.java
index a5dfe34ef3..0ae881b9a5 100644
--- a/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentUpdated.java
+++ b/server-core/src/main/java/io/onedev/server/event/codecomment/CodeCommentUpdated.java
@@ -2,11 +2,10 @@ package io.onedev.server.event.codecomment;
import java.util.Date;
-import io.onedev.server.event.MarkdownAware;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.User;
-public class CodeCommentUpdated extends CodeCommentEvent implements MarkdownAware {
+public class CodeCommentUpdated extends CodeCommentEvent {
public CodeCommentUpdated(User user, CodeComment comment) {
super(user, new Date(), comment);
diff --git a/server-core/src/main/java/io/onedev/server/event/issue/IssueChangeEvent.java b/server-core/src/main/java/io/onedev/server/event/issue/IssueChangeEvent.java
index 47ea95e63a..35e7612eb5 100644
--- a/server-core/src/main/java/io/onedev/server/event/issue/IssueChangeEvent.java
+++ b/server-core/src/main/java/io/onedev/server/event/issue/IssueChangeEvent.java
@@ -3,12 +3,12 @@ package io.onedev.server.event.issue;
import java.util.Collection;
import java.util.Map;
-import io.onedev.server.event.MarkdownAware;
import io.onedev.server.model.Group;
import io.onedev.server.model.IssueChange;
import io.onedev.server.model.User;
+import io.onedev.server.notification.ActivityDetail;
-public class IssueChangeEvent extends IssueEvent implements MarkdownAware {
+public class IssueChangeEvent extends IssueEvent {
private final IssueChange change;
@@ -49,4 +49,9 @@ public class IssueChangeEvent extends IssueEvent implements MarkdownAware {
return getChange().getData().getActivity();
}
+ @Override
+ public ActivityDetail getActivityDetail() {
+ return getChange().getData().getActivityDetail();
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/event/issue/IssueCommented.java b/server-core/src/main/java/io/onedev/server/event/issue/IssueCommented.java
index 2070201459..08e678524a 100644
--- a/server-core/src/main/java/io/onedev/server/event/issue/IssueCommented.java
+++ b/server-core/src/main/java/io/onedev/server/event/issue/IssueCommented.java
@@ -2,10 +2,9 @@ package io.onedev.server.event.issue;
import java.util.Collection;
-import io.onedev.server.event.MarkdownAware;
import io.onedev.server.model.IssueComment;
-public class IssueCommented extends IssueEvent implements MarkdownAware {
+public class IssueCommented extends IssueEvent {
private final IssueComment comment;
diff --git a/server-core/src/main/java/io/onedev/server/event/issue/IssueOpened.java b/server-core/src/main/java/io/onedev/server/event/issue/IssueOpened.java
index 9eb6c14eb6..19d2d1d973 100644
--- a/server-core/src/main/java/io/onedev/server/event/issue/IssueOpened.java
+++ b/server-core/src/main/java/io/onedev/server/event/issue/IssueOpened.java
@@ -9,14 +9,13 @@ import java.util.stream.Collectors;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.GroupManager;
import io.onedev.server.entitymanager.UserManager;
-import io.onedev.server.event.MarkdownAware;
import io.onedev.server.model.Group;
import io.onedev.server.model.Issue;
import io.onedev.server.model.User;
import io.onedev.server.model.support.issue.field.spec.FieldSpec;
import io.onedev.server.util.Input;
-public class IssueOpened extends IssueEvent implements MarkdownAware {
+public class IssueOpened extends IssueEvent {
public IssueOpened(Issue issue) {
super(issue.getSubmitter(), issue.getSubmitDate(), issue);
diff --git a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestChangeEvent.java b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestChangeEvent.java
index d7d86aeb31..646de5e598 100644
--- a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestChangeEvent.java
+++ b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestChangeEvent.java
@@ -2,7 +2,6 @@ package io.onedev.server.event.pullrequest;
import org.eclipse.jgit.lib.ObjectId;
-import io.onedev.server.event.MarkdownAware;
import io.onedev.server.model.PullRequestChange;
import io.onedev.server.model.support.pullrequest.MergePreview;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestDiscardData;
@@ -10,7 +9,7 @@ import io.onedev.server.model.support.pullrequest.changedata.PullRequestMergeDat
import io.onedev.server.util.CommitAware;
import io.onedev.server.util.ProjectScopedCommit;
-public class PullRequestChangeEvent extends PullRequestEvent implements MarkdownAware, CommitAware {
+public class PullRequestChangeEvent extends PullRequestEvent implements CommitAware {
private final PullRequestChange change;
diff --git a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentCreated.java b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentCreated.java
index b8fc008e4b..11c0e63a22 100644
--- a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentCreated.java
+++ b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentCreated.java
@@ -1,10 +1,9 @@
package io.onedev.server.event.pullrequest;
-import io.onedev.server.event.MarkdownAware;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.PullRequest;
-public class PullRequestCodeCommentCreated extends PullRequestCodeCommentEvent implements MarkdownAware {
+public class PullRequestCodeCommentCreated extends PullRequestCodeCommentEvent {
public PullRequestCodeCommentCreated(PullRequest request, CodeComment comment) {
super(comment.getUser(), comment.getCreateDate(), request, comment);
diff --git a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentEvent.java b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentEvent.java
index f108bc5a6b..e095c734ac 100644
--- a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentEvent.java
+++ b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentEvent.java
@@ -2,12 +2,11 @@ package io.onedev.server.event.pullrequest;
import java.util.Date;
-import io.onedev.server.event.MarkdownAware;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
-public abstract class PullRequestCodeCommentEvent extends PullRequestEvent implements MarkdownAware {
+public abstract class PullRequestCodeCommentEvent extends PullRequestEvent {
private final CodeComment comment;
diff --git a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCommented.java b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCommented.java
index 20e6baec98..e95f08d21b 100644
--- a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCommented.java
+++ b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCommented.java
@@ -2,10 +2,9 @@ package io.onedev.server.event.pullrequest;
import java.util.Collection;
-import io.onedev.server.event.MarkdownAware;
import io.onedev.server.model.PullRequestComment;
-public class PullRequestCommented extends PullRequestEvent implements MarkdownAware {
+public class PullRequestCommented extends PullRequestEvent {
private final PullRequestComment comment;
diff --git a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestOpened.java b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestOpened.java
index e03f4f5c9e..917875c331 100644
--- a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestOpened.java
+++ b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestOpened.java
@@ -1,9 +1,8 @@
package io.onedev.server.event.pullrequest;
-import io.onedev.server.event.MarkdownAware;
import io.onedev.server.model.PullRequest;
-public class PullRequestOpened extends PullRequestEvent implements MarkdownAware {
+public class PullRequestOpened extends PullRequestEvent {
public PullRequestOpened(PullRequest request) {
super(request.getSubmitter(), request.getSubmitDate(), request);
diff --git a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestUpdated.java b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestUpdated.java
index e0c616fcd2..ddf6a452b1 100644
--- a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestUpdated.java
+++ b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestUpdated.java
@@ -25,7 +25,7 @@ public class PullRequestUpdated extends PullRequestEvent {
@Override
public String getActivity() {
- return "Commits added";
+ return "added commits";
}
public Collection<User> getCommitters() {
diff --git a/server-core/src/main/java/io/onedev/server/git/GitSshCommandCreator.java b/server-core/src/main/java/io/onedev/server/git/GitSshCommandCreator.java
index c894bcc503..b16e828169 100644
--- a/server-core/src/main/java/io/onedev/server/git/GitSshCommandCreator.java
+++ b/server-core/src/main/java/io/onedev/server/git/GitSshCommandCreator.java
@@ -17,9 +17,10 @@ import org.apache.shiro.util.ThreadContext;
import org.apache.sshd.common.channel.ChannelOutputStream;
import org.apache.sshd.server.Environment;
import org.apache.sshd.server.ExitCallback;
-import org.apache.sshd.server.SessionAware;
+import org.apache.sshd.server.channel.ChannelSession;
import org.apache.sshd.server.command.Command;
import org.apache.sshd.server.session.ServerSession;
+import org.apache.sshd.server.session.ServerSessionAware;
import org.eclipse.jgit.transport.RemoteConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -117,7 +118,7 @@ public class GitSshCommandCreator implements SshCommandCreator {
}
}
- private abstract class GitSshCommand implements Command, SessionAware {
+ private abstract class GitSshCommand implements Command, ServerSessionAware {
private static final int PRIORITY = 2;
@@ -156,7 +157,7 @@ public class GitSshCommandCreator implements SshCommandCreator {
}
@Override
- public void start(Environment env) throws IOException {
+ public void start(ChannelSession channel, Environment env) throws IOException {
ThreadContext.bind(SecurityUtils.asSubject(authenticator.getPublicKeyOwnerId(session)));
File gitDir;
@@ -206,7 +207,7 @@ public class GitSshCommandCreator implements SshCommandCreator {
protected abstract ExecutionResult execute(File gitDir, Map<String, String> gitEnvs);
@Override
- public void destroy() throws Exception {
+ public void destroy(ChannelSession channel) throws Exception {
if (commandFuture != null)
commandFuture.cancel(true);
}
diff --git a/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java b/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java
index 5b538c6ba8..0f63302898 100644
--- a/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java
+++ b/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java
@@ -5,6 +5,7 @@ import java.io.ObjectStreamException;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Set;
@@ -225,8 +226,23 @@ public class DefaultDataManager implements DataManager, Serializable {
settingManager.saveProjectSetting(new GlobalProjectSetting());
}
setting = settingManager.getSetting(Key.SERVICE_DESK_SETTING);
- if (setting == null) {
- settingManager.saveServiceDeskSetting(new ServiceDeskSetting());
+ if (setting == null) {
+ settingManager.saveServiceDeskSetting(null);
+ } else if (setting.getValue() != null && !validator.validate(setting.getValue()).isEmpty()) {
+ manualConfigs.add(new ManualConfig("Specify Service Desk Setting", null,
+ setting.getValue(), new HashSet<>(), true) {
+
+ @Override
+ public Skippable getSkippable() {
+ return null;
+ }
+
+ @Override
+ public void complete() {
+ settingManager.saveServiceDeskSetting((ServiceDeskSetting) getSetting());
+ }
+
+ });
}
setting = settingManager.getSetting(Key.NOTIFICATION_TEMPLATE_SETTING);
if (setting == null) {
@@ -345,8 +361,8 @@ public class DefaultDataManager implements DataManager, Serializable {
+ "%s",
url, Throwables.getStackTraceAsString(e));
mailManager.sendMail(Lists.newArrayList(root.getEmail()), Lists.newArrayList(),
- "OneDev database auto-backup failed", htmlBody, textBody,
- null, null);
+ Lists.newArrayList(), "[Backup] OneDev Database Auto-backup Failed",
+ htmlBody, textBody, null, null);
}
public Object writeReplace() throws ObjectStreamException {
diff --git a/server-core/src/main/java/io/onedev/server/util/markdown/CodeProcessor.java b/server-core/src/main/java/io/onedev/server/markdown/CodeProcessor.java
similarity index 98%
rename from server-core/src/main/java/io/onedev/server/util/markdown/CodeProcessor.java
rename to server-core/src/main/java/io/onedev/server/markdown/CodeProcessor.java
index 097576d327..0544b3054e 100644
--- a/server-core/src/main/java/io/onedev/server/util/markdown/CodeProcessor.java
+++ b/server-core/src/main/java/io/onedev/server/markdown/CodeProcessor.java
@@ -1,4 +1,4 @@
-package io.onedev.server.util.markdown;
+package io.onedev.server.markdown;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/server-core/src/main/java/io/onedev/server/util/markdown/CommitProcessor.java b/server-core/src/main/java/io/onedev/server/markdown/CommitProcessor.java
similarity index 96%
rename from server-core/src/main/java/io/onedev/server/util/markdown/CommitProcessor.java
rename to server-core/src/main/java/io/onedev/server/markdown/CommitProcessor.java
index d853f4d771..5b59f5a9e1 100644
--- a/server-core/src/main/java/io/onedev/server/util/markdown/CommitProcessor.java
+++ b/server-core/src/main/java/io/onedev/server/markdown/CommitProcessor.java
@@ -1,4 +1,4 @@
-package io.onedev.server.util.markdown;
+package io.onedev.server.markdown;
import java.util.Collection;
import java.util.regex.Matcher;
@@ -14,9 +14,9 @@ import org.jsoup.select.NodeTraversor;
import com.google.common.collect.ImmutableSet;
-import io.onedev.commons.utils.HtmlUtils;
import io.onedev.server.git.GitUtils;
import io.onedev.server.model.Project;
+import io.onedev.server.util.HtmlUtils;
import io.onedev.server.util.TextNodeVisitor;
import io.onedev.server.web.page.project.commits.CommitDetailPage;
diff --git a/server-core/src/main/java/io/onedev/server/util/markdown/DefaultMarkdownManager.java b/server-core/src/main/java/io/onedev/server/markdown/DefaultMarkdownManager.java
similarity index 91%
rename from server-core/src/main/java/io/onedev/server/util/markdown/DefaultMarkdownManager.java
rename to server-core/src/main/java/io/onedev/server/markdown/DefaultMarkdownManager.java
index 56bda2f655..f04f283ba3 100644
--- a/server-core/src/main/java/io/onedev/server/util/markdown/DefaultMarkdownManager.java
+++ b/server-core/src/main/java/io/onedev/server/markdown/DefaultMarkdownManager.java
@@ -1,4 +1,4 @@
-package io.onedev.server.util.markdown;
+package io.onedev.server.markdown;
import java.util.ArrayList;
import java.util.List;
@@ -8,8 +8,6 @@ import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.text.StringEscapeUtils;
import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
@@ -27,9 +25,9 @@ import com.vladsch.flexmark.parser.ParserEmulationProfile;
import com.vladsch.flexmark.util.options.MutableDataHolder;
import com.vladsch.flexmark.util.options.MutableDataSet;
-import io.onedev.commons.utils.HtmlUtils;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.Project;
+import io.onedev.server.util.HtmlUtils;
import io.onedev.server.web.resource.AttachmentResource;
@Singleton
@@ -80,13 +78,6 @@ public class DefaultMarkdownManager implements MarkdownManager {
return HtmlRenderer.builder(options).softBreak("<br>").build().render(node);
}
- @Override
- public String escape(String markdown) {
- markdown = StringEscapeUtils.escapeHtml4(markdown);
- markdown = StringUtils.replace(markdown, "\n", "<br>");
- return markdown;
- }
-
@Override
public Document process(Document document, @Nullable Project project, @Nullable Object context, boolean forExternal) {
document = HtmlUtils.sanitize(document);
@@ -100,7 +91,11 @@ public class DefaultMarkdownManager implements MarkdownManager {
src = settingManager.getSystemSetting().getServerUrl() + src;
element.attr("src", AttachmentResource.authorizeGroup(src));
}
- element.attr("width", "100%");
+ String style = element.attr("style");
+ if (!style.endsWith(";"))
+ style += ";";
+ style += "max-width:100%";
+ element.attr("style", style);
}
for (Element element: document.body().getElementsByTag("a")) {
String href = element.attr("href");
diff --git a/server-core/src/main/java/io/onedev/server/util/markdown/MarkdownManager.java b/server-core/src/main/java/io/onedev/server/markdown/MarkdownManager.java
similarity index 65%
rename from server-core/src/main/java/io/onedev/server/util/markdown/MarkdownManager.java
rename to server-core/src/main/java/io/onedev/server/markdown/MarkdownManager.java
index 1d0b209bc2..50e8f77d78 100644
--- a/server-core/src/main/java/io/onedev/server/util/markdown/MarkdownManager.java
+++ b/server-core/src/main/java/io/onedev/server/markdown/MarkdownManager.java
@@ -1,4 +1,4 @@
-package io.onedev.server.util.markdown;
+package io.onedev.server.markdown;
import javax.annotation.Nullable;
@@ -27,15 +27,4 @@ public interface MarkdownManager {
String process(String html, @Nullable Project project, @Nullable Object context, boolean forExternal);
- /**
- * Escape html characters in specified markdown so that the markdown plain text
- * can be embedded in html content such as html email.
- *
- * @param markdown
- * markdown to be escaped
- * @return
- * escaped markdown plain text
- */
- String escape(String markdown);
-
}
diff --git a/server-core/src/main/java/io/onedev/server/util/markdown/MarkdownProcessor.java b/server-core/src/main/java/io/onedev/server/markdown/MarkdownProcessor.java
similarity index 88%
rename from server-core/src/main/java/io/onedev/server/util/markdown/MarkdownProcessor.java
rename to server-core/src/main/java/io/onedev/server/markdown/MarkdownProcessor.java
index 2d2a825bba..9ac3405e88 100644
--- a/server-core/src/main/java/io/onedev/server/util/markdown/MarkdownProcessor.java
+++ b/server-core/src/main/java/io/onedev/server/markdown/MarkdownProcessor.java
@@ -1,4 +1,4 @@
-package io.onedev.server.util.markdown;
+package io.onedev.server.markdown;
import javax.annotation.Nullable;
diff --git a/server-core/src/main/java/io/onedev/server/util/markdown/MentionParser.java b/server-core/src/main/java/io/onedev/server/markdown/MentionParser.java
similarity index 95%
rename from server-core/src/main/java/io/onedev/server/util/markdown/MentionParser.java
rename to server-core/src/main/java/io/onedev/server/markdown/MentionParser.java
index 8b8247b850..374541f28b 100644
--- a/server-core/src/main/java/io/onedev/server/util/markdown/MentionParser.java
+++ b/server-core/src/main/java/io/onedev/server/markdown/MentionParser.java
@@ -1,4 +1,4 @@
-package io.onedev.server.util.markdown;
+package io.onedev.server.markdown;
import java.util.Collection;
import java.util.HashSet;
@@ -12,7 +12,7 @@ import org.jsoup.select.NodeTraversor;
import com.google.common.collect.ImmutableSet;
-import io.onedev.commons.utils.HtmlUtils;
+import io.onedev.server.util.HtmlUtils;
import io.onedev.server.util.TextNodeVisitor;
public class MentionParser {
diff --git a/server-core/src/main/java/io/onedev/server/util/markdown/MentionProcessor.java b/server-core/src/main/java/io/onedev/server/markdown/MentionProcessor.java
similarity index 94%
rename from server-core/src/main/java/io/onedev/server/util/markdown/MentionProcessor.java
rename to server-core/src/main/java/io/onedev/server/markdown/MentionProcessor.java
index b2d7e2747e..84a4ff93be 100644
--- a/server-core/src/main/java/io/onedev/server/util/markdown/MentionProcessor.java
+++ b/server-core/src/main/java/io/onedev/server/markdown/MentionProcessor.java
@@ -1,4 +1,4 @@
-package io.onedev.server.util.markdown;
+package io.onedev.server.markdown;
import org.apache.wicket.request.cycle.RequestCycle;
import org.jsoup.nodes.Document;
diff --git a/server-core/src/main/java/io/onedev/server/util/markdown/UrlProcessor.java b/server-core/src/main/java/io/onedev/server/markdown/UrlProcessor.java
similarity index 99%
rename from server-core/src/main/java/io/onedev/server/util/markdown/UrlProcessor.java
rename to server-core/src/main/java/io/onedev/server/markdown/UrlProcessor.java
index 3bc90319cf..35ea2e0175 100644
--- a/server-core/src/main/java/io/onedev/server/util/markdown/UrlProcessor.java
+++ b/server-core/src/main/java/io/onedev/server/markdown/UrlProcessor.java
@@ -1,4 +1,4 @@
-package io.onedev.server.util.markdown;
+package io.onedev.server.markdown;
import java.io.IOException;
diff --git a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
index 41feae3bfa..e6a935fc84 100644
--- a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
+++ b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
@@ -2648,13 +2648,21 @@ public class DataMigrator {
dom.writeToFile(file, false);
} else if (file.getName().startsWith("IssueChanges.xml")) {
VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);
- for (Element element: dom.getRootElement().elements())
- useUnknownUser(element, "user");
+ for (Element element: dom.getRootElement().elements()) {
+ if (element.element("data").attributeValue("class").contains("IssueDescriptionChangeData"))
+ element.detach();
+ else
+ useUnknownUser(element, "user");
+ }
dom.writeToFile(file, false);
} else if (file.getName().startsWith("PullRequestChanges.xml")) {
VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);
- for (Element element: dom.getRootElement().elements())
- useUnknownUser(element, "user");
+ for (Element element: dom.getRootElement().elements()) {
+ if (element.element("data").attributeValue("class").contains("PullRequestDescriptionChangeData"))
+ element.detach();
+ else
+ useUnknownUser(element, "user");
+ }
dom.writeToFile(file, false);
} else if (file.getName().startsWith("IssueComments.xml")) {
VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);
@@ -2717,45 +2725,47 @@ public class DataMigrator {
if (id > maxId)
maxId = id;
}
- Element serviceDeskSettingElement = dom.getRootElement().addElement("io.onedev.server.model.Setting");
- serviceDeskSettingElement.addAttribute("revision", "0.0");
- serviceDeskSettingElement.addElement("id").setText(String.valueOf(maxId+1));
- serviceDeskSettingElement.addElement("key").setText("SERVICE_DESK_SETTING");
- Element valueElement = serviceDeskSettingElement.addElement("value");
- valueElement.addAttribute("class", "io.onedev.server.model.support.administration.ServiceDeskSetting");
- Element senderAuthorizationsElement = valueElement.addElement("senderAuthorizations");
- Element defaultProjectDesignationsElement = valueElement.addElement("defaultProjectDesignations");
- Element issueCreationSettingsElement = valueElement.addElement("issueCreationSettings");
- for (Element oldSenderAuthorizationElement: oldSenderAuthorizationElements) {
- Element senderAuthorizationElement = senderAuthorizationsElement
- .addElement("io.onedev.server.model.support.administration.SenderAuthorization");
- Element defaultProjectDesignationElement = defaultProjectDesignationsElement
- .addElement("io.onedev.server.model.support.administration.DefaultProjectDesignation");
- Element issueCreationSettingElement = issueCreationSettingsElement
- .addElement("io.onedev.server.model.support.administration.IssueCreationSetting");
-
- Element senderEmailsElement = oldSenderAuthorizationElement.element("senderEmails");
- if (senderEmailsElement != null) {
- String senderEmails = senderEmailsElement.getText().trim();
- senderAuthorizationElement.addElement("senderEmails").setText(senderEmails);
- defaultProjectDesignationElement.addElement("senderEmails").setText(senderEmails);
- issueCreationSettingElement.addElement("senderEmails").setText(senderEmails);
+
+ if (oldSenderAuthorizationElements != null && !oldSenderAuthorizationElements.isEmpty()) {
+ Element serviceDeskSettingElement = dom.getRootElement().addElement("io.onedev.server.model.Setting");
+ serviceDeskSettingElement.addAttribute("revision", "0.0");
+ serviceDeskSettingElement.addElement("id").setText(String.valueOf(maxId+1));
+ serviceDeskSettingElement.addElement("key").setText("SERVICE_DESK_SETTING");
+ Element valueElement = serviceDeskSettingElement.addElement("value");
+ valueElement.addAttribute("class", "io.onedev.server.model.support.administration.ServiceDeskSetting");
+ Element senderAuthorizationsElement = valueElement.addElement("senderAuthorizations");
+ Element projectDesignationsElement = valueElement.addElement("projectDesignations");
+ Element issueCreationSettingsElement = valueElement.addElement("issueCreationSettings");
+ for (Element oldSenderAuthorizationElement: oldSenderAuthorizationElements) {
+ Element senderAuthorizationElement = senderAuthorizationsElement
+ .addElement("io.onedev.server.model.support.administration.SenderAuthorization");
+ Element projectDesignationElement = projectDesignationsElement
+ .addElement("io.onedev.server.model.support.administration.ProjectDesignation");
+ Element issueCreationSettingElement = issueCreationSettingsElement
+ .addElement("io.onedev.server.model.support.administration.IssueCreationSetting");
+
+ Element senderEmailsElement = oldSenderAuthorizationElement.element("senderEmails");
+ if (senderEmailsElement != null) {
+ String senderEmails = senderEmailsElement.getText().trim();
+ senderAuthorizationElement.addElement("senderEmails").setText(senderEmails);
+ projectDesignationElement.addElement("senderEmails").setText(senderEmails);
+ issueCreationSettingElement.addElement("senderEmails").setText(senderEmails);
+ }
+
+ Element authorizedProjectsElement = oldSenderAuthorizationElement.element("authorizedProjects");
+ if (authorizedProjectsElement != null) {
+ senderAuthorizationElement.addElement("authorizedProjects")
+ .setText(authorizedProjectsElement.getText().trim());
+ }
+ senderAuthorizationElement.addElement("authorizedRoleName")
+ .setText(oldSenderAuthorizationElement.elementText("authorizedRoleName").trim());
+ projectDesignationElement.addElement("project")
+ .setText(oldSenderAuthorizationElement.elementText("defaultProject").trim());
+ Element issueFieldsElement = oldSenderAuthorizationElement.element("issueFields");
+ issueFieldsElement.detach();
+ issueCreationSettingElement.add(issueFieldsElement);
}
-
- Element authorizedProjectsElement = oldSenderAuthorizationElement.element("authorizedProjects");
- if (authorizedProjectsElement != null) {
- senderAuthorizationElement.addElement("authorizedProjects")
- .setText(authorizedProjectsElement.getText().trim());
- }
- senderAuthorizationElement.addElement("authorizedRoleName")
- .setText(oldSenderAuthorizationElement.elementText("authorizedRoleName").trim());
- defaultProjectDesignationElement.addElement("defaultProject")
- .setText(oldSenderAuthorizationElement.elementText("defaultProject").trim());
- Element issueFieldsElement = oldSenderAuthorizationElement.element("issueFields");
- issueFieldsElement.detach();
- issueCreationSettingElement.add(issueFieldsElement);
}
-
dom.writeToFile(file, false);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/model/Build.java b/server-core/src/main/java/io/onedev/server/model/Build.java
index f3ca17e6a0..3cd180b5ad 100644
--- a/server-core/src/main/java/io/onedev/server/model/Build.java
+++ b/server-core/src/main/java/io/onedev/server/model/Build.java
@@ -67,6 +67,7 @@ import io.onedev.server.buildspec.param.spec.ParamSpec;
import io.onedev.server.buildspec.param.spec.SecretParam;
import io.onedev.server.buildspec.param.supply.ParamSupply;
import io.onedev.server.entitymanager.BuildManager;
+import io.onedev.server.entityreference.Referenceable;
import io.onedev.server.git.GitUtils;
import io.onedev.server.git.RefInfo;
import io.onedev.server.infomanager.CommitInfoManager;
@@ -86,7 +87,6 @@ import io.onedev.server.util.IssueUtils;
import io.onedev.server.util.JobSecretAuthorizationContext;
import io.onedev.server.util.MatrixRunner;
import io.onedev.server.util.ProjectScopedNumber;
-import io.onedev.server.util.Referenceable;
import io.onedev.server.util.facade.BuildFacade;
import io.onedev.server.util.match.WildcardUtils;
import io.onedev.server.util.patternset.PatternSet;
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 7a8b8d65c0..6a0f517198 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
@@ -53,6 +53,7 @@ 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.entityreference.Referenceable;
import io.onedev.server.infomanager.CommitInfoManager;
import io.onedev.server.infomanager.PullRequestInfoManager;
import io.onedev.server.infomanager.UserInfoManager;
@@ -66,7 +67,6 @@ import io.onedev.server.storage.AttachmentStorageSupport;
import io.onedev.server.util.CollectionUtils;
import io.onedev.server.util.Input;
import io.onedev.server.util.ProjectScopedNumber;
-import io.onedev.server.util.Referenceable;
import io.onedev.server.util.facade.IssueFacade;
import io.onedev.server.web.editable.BeanDescriptor;
import io.onedev.server.web.editable.PropertyDescriptor;
@@ -298,6 +298,13 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentSt
this.threadingReference = threadingReference;
}
+ public String getEffectiveThreadingReference() {
+ String threadingReference = getThreadingReference();
+ if (threadingReference == null)
+ threadingReference = "<" + getUUID() + "@onedev>";
+ return threadingReference;
+ }
+
@Override
public long getNumber() {
return number;
diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequest.java b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
index 8b369e1b3c..150f4a1150 100644
--- a/server-core/src/main/java/io/onedev/server/model/PullRequest.java
+++ b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
@@ -56,6 +56,7 @@ import com.google.common.collect.Lists;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.PullRequestManager;
import io.onedev.server.entitymanager.UserManager;
+import io.onedev.server.entityreference.Referenceable;
import io.onedev.server.git.GitUtils;
import io.onedev.server.infomanager.PullRequestInfoManager;
import io.onedev.server.infomanager.UserInfoManager;
@@ -73,7 +74,6 @@ import io.onedev.server.util.ComponentContext;
import io.onedev.server.util.IssueUtils;
import io.onedev.server.util.ProjectAndBranch;
import io.onedev.server.util.ProjectScopedNumber;
-import io.onedev.server.util.Referenceable;
import io.onedev.server.web.util.PullRequestAware;
import io.onedev.server.web.util.WicketUtils;
@@ -1175,5 +1175,14 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attach
return "Source branch already exists";
return null;
}
+
+ public String getStatusName() {
+ if (isMerged())
+ return "Merged";
+ else if (isDiscarded())
+ return "Discarded";
+ else
+ return "Open";
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/MailSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/MailSetting.java
index 4fac6a53cf..949e82a755 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/MailSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/MailSetting.java
@@ -71,7 +71,8 @@ public class MailSetting implements Serializable {
}
@Editable(order=410, name="System Email Address", description="This email address will be used as sender "
- + "address for various notifications")
+ + "address for various notifications. Its inbox will also be checked if <tt>Check Incoming Email</tt>"
+ + "option is enabled below")
@NotEmpty
public String getEmailAddress() {
return emailAddress;
@@ -81,10 +82,9 @@ public class MailSetting implements Serializable {
this.emailAddress = emailAddress;
}
- @Editable(order=450, name="Check Incoming Email", description="Enable this to use the service desk feature (creating issue, "
- + "posting issue or pull request comments from email) <br>"
+ @Editable(order=450, name="Check Incoming Email", description="Enable this to post issue and pull request comments via email<br>"
+ "<b class='text-danger'>NOTE:</b> <a href='https://en.wikipedia.org/wiki/Email_address#Subaddressing' target='_blank'>Sub addressing</a> "
- + "needs to be enabled for your mail server, as OneDev needs to use this to track context of sent email and received email")
+ + "needs to be enabled for system email address, as OneDev uses it to track issue and pull request contexts")
public ReceiveMailSetting getReceiveMailSetting() {
return receiveMailSetting;
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/DefaultProjectDesignation.java b/server-core/src/main/java/io/onedev/server/model/support/administration/ProjectDesignation.java
similarity index 85%
rename from server-core/src/main/java/io/onedev/server/model/support/administration/DefaultProjectDesignation.java
rename to server-core/src/main/java/io/onedev/server/model/support/administration/ProjectDesignation.java
index 6e1ea28bce..1100d16e81 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/DefaultProjectDesignation.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/ProjectDesignation.java
@@ -15,13 +15,13 @@ import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
import io.onedev.server.web.editable.annotation.Patterns;
@Editable
-public class DefaultProjectDesignation implements Serializable {
+public class ProjectDesignation implements Serializable {
private static final long serialVersionUID = 1L;
private String senderEmails;
- private String defaultProject;
+ private String project;
@Editable(order=100, name="Applicable Senders", description="Specify space-separated sender "
+ "email addresses applicable for this entry. Use '*' or '?' for wildcard match. "
@@ -39,12 +39,12 @@ public class DefaultProjectDesignation implements Serializable {
@Editable(order=200)
@ChoiceProvider("getProjectChoices")
@NotEmpty
- public String getDefaultProject() {
- return defaultProject;
+ public String getProject() {
+ return project;
}
- public void setDefaultProject(String defaultProject) {
- this.defaultProject = defaultProject;
+ public void setProject(String project) {
+ this.project = project;
}
@SuppressWarnings("unused")
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/ServiceDeskSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/ServiceDeskSetting.java
index ad46359f07..b5d3610083 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/ServiceDeskSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/ServiceDeskSetting.java
@@ -7,38 +7,49 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.stream.Collectors;
import javax.annotation.Nullable;
+import javax.validation.ConstraintValidatorContext;
+import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.commons.utils.ExplicitException;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.Project;
+import io.onedev.server.model.support.issue.field.supply.FieldSupply;
import io.onedev.server.util.match.Matcher;
import io.onedev.server.util.match.StringMatcher;
import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.util.usage.Usage;
+import io.onedev.server.util.validation.Validatable;
+import io.onedev.server.util.validation.annotation.ClassValidating;
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;
import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValuesResolution;
import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.OmitName;
@Editable
-public class ServiceDeskSetting implements Serializable {
+@ClassValidating
+public class ServiceDeskSetting implements Serializable, Validatable {
private static final long serialVersionUID = 1L;
- public static final String PROP_SENDER_AUTHORIZATIONS = "senderAuthorizations";
-
- public static final String PROP_DEFAULT_PROJECT_DESIGNATIONS = "defaultProjectDesignations";
+ private static final String PROP_PROJECT_DESIGNATIONS = "projectDesignations";
+ private static final String PROP_ISSUE_CREATION_SETTINGS = "issueCreationSettings";
+
private List<SenderAuthorization> senderAuthorizations = new ArrayList<>();
- private List<DefaultProjectDesignation> defaultProjectDesignations = new ArrayList<>();
+ private List<ProjectDesignation> projectDesignations = new ArrayList<>();
private List<IssueCreationSetting> issueCreationSettings = new ArrayList<>();
-
- @Editable
- @OmitName
+
+ @Editable(order=100, description="When sender email address can not be mapped to an existing user, "
+ + "OneDev will use entries defined here to determine if the sender has permission to "
+ + "create issues. For a particular sender, the first matching entry will take "
+ + "effect")
public List<SenderAuthorization> getSenderAuthorizations() {
return senderAuthorizations;
}
@@ -47,16 +58,29 @@ public class ServiceDeskSetting implements Serializable {
this.senderAuthorizations = senderAuthorizations;
}
- @Editable
- @OmitName
- public List<DefaultProjectDesignation> getDefaultProjectDesignations() {
- return defaultProjectDesignations;
+ @Editable(order=200, description="When email is sent to system email address without specifying "
+ + "project information, OneDev will use entries defined here to decide in which "
+ + "project to create issues. For a particular sender, the first matching entry will "
+ + "take effect")
+ public List<ProjectDesignation> getProjectDesignations() {
+ return projectDesignations;
}
- public void setDefaultProjectDesignations(List<DefaultProjectDesignation> defaultProjectDesignations) {
- this.defaultProjectDesignations = defaultProjectDesignations;
+ public void setProjectDesignations(List<ProjectDesignation> projectDesignations) {
+ this.projectDesignations = projectDesignations;
}
+ @SuppressWarnings("unused")
+ private static List<String> getProjectChoices() {
+ List<String> projectNames = OneDev.getInstance(ProjectManager.class)
+ .query().stream().map(it->it.getName()).collect(Collectors.toList());
+ Collections.sort(projectNames);
+ return projectNames;
+ }
+
+ @Editable(order=300, description="Specify issue creation settings. For a particular sender and project, "
+ + "the first matching entry will take effect. If no entry matches, default issue creation "
+ + "settings defined below will be used")
public List<IssueCreationSetting> getIssueCreationSettings() {
return issueCreationSettings;
}
@@ -65,6 +89,11 @@ public class ServiceDeskSetting implements Serializable {
this.issueCreationSettings = issueCreationSettings;
}
+ @SuppressWarnings("unused")
+ private static Collection<String> getIssueFieldNames() {
+ return OneDev.getInstance(SettingManager.class).getIssueSetting().getPromptFieldsUponIssueOpen();
+ }
+
@Nullable
public SenderAuthorization getSenderAuthorization(String senderAddress) {
Matcher matcher = new StringMatcher();
@@ -79,21 +108,20 @@ public class ServiceDeskSetting implements Serializable {
return null;
}
- @Nullable
- public DefaultProjectDesignation getDefaultProjectDesignation(String senderAddress) {
+ public String getDesignatedProject(String senderAddress) {
Matcher matcher = new StringMatcher();
- for (DefaultProjectDesignation designation: defaultProjectDesignations) {
+ for (ProjectDesignation designation: projectDesignations) {
String patterns = designation.getSenderEmails();
if (patterns == null)
patterns = "*";
PatternSet patternSet = PatternSet.parse(patterns);
if (patternSet.matches(matcher, senderAddress))
- return designation;
+ return designation.getProject();
}
- return null;
+ throw new ExplicitException("No project designated for sender: " + senderAddress);
}
- public IssueCreationSetting getIssueCreationSetting(String senderAddress, Project project) {
+ public List<FieldSupply> getIssueCreationSetting(String senderAddress, Project project) {
Matcher matcher = new StringMatcher();
for (IssueCreationSetting setting: issueCreationSettings) {
String senderPatterns = setting.getSenderEmails();
@@ -107,9 +135,9 @@ public class ServiceDeskSetting implements Serializable {
PatternSet projectPatternSet = PatternSet.parse(projectPatterns);
if (senderPatternSet.matches(matcher, senderAddress) && projectPatternSet.matches(matcher, project.getName()))
- return setting;
+ return setting.getIssueFields();
}
- String errorMessage = String.format("No issue creation setting found (sender: %s, project: %s)",
+ String errorMessage = String.format("No issue creation setting (sender: %s, project: %s)",
senderAddress, project.getName());
throw new ExplicitException(errorMessage);
}
@@ -143,9 +171,9 @@ public class ServiceDeskSetting implements Serializable {
if (authorization.getAuthorizedProjects().length() == 0)
authorization.setAuthorizedProjects(null);
}
- for (DefaultProjectDesignation designation: getDefaultProjectDesignations()) {
- if (designation.getDefaultProject().equals(oldName))
- designation.setDefaultProject(newName);
+ for (ProjectDesignation designation: getProjectDesignations()) {
+ if (designation.getProject().equals(oldName))
+ designation.setProject(newName);
}
for (IssueCreationSetting setting: getIssueCreationSettings()) {
PatternSet patternSet = PatternSet.parse(setting.getApplicableProjects());
@@ -171,9 +199,9 @@ public class ServiceDeskSetting implements Serializable {
}
index = 0;
- for (DefaultProjectDesignation designation: getDefaultProjectDesignations()) {
- if (designation.getDefaultProject().equals(projectName))
- usage.add("default project designation #" + index + ": default project");
+ for (ProjectDesignation senderProject: getProjectDesignations()) {
+ if (senderProject.getProject().equals(projectName))
+ usage.add("sender project #" + index + ": project");
index++;
}
@@ -210,5 +238,47 @@ public class ServiceDeskSetting implements Serializable {
for (IssueCreationSetting setting: getIssueCreationSettings())
setting.fixUndefinedFieldValues(resolutions);
}
+
+ @Override
+ public boolean isValid(ConstraintValidatorContext context) {
+ boolean isValid = true;
+
+ boolean foundDefault = false;
+ for (ProjectDesignation designation: getProjectDesignations()) {
+ if (designation.getSenderEmails() == null) {
+ foundDefault = true;
+ break;
+ }
+ }
+ if (!foundDefault) {
+ String errorMessage = "An entry with any sender should be defined to be used as "
+ + "default project designation";
+ context.buildConstraintViolationWithTemplate(errorMessage)
+ .addPropertyNode(PROP_PROJECT_DESIGNATIONS)
+ .addConstraintViolation();
+ isValid = false;
+ }
+
+ foundDefault = false;
+ for (IssueCreationSetting setting: getIssueCreationSettings()) {
+ if (setting.getSenderEmails() == null && setting.getApplicableProjects() == null) {
+ foundDefault = true;
+ break;
+ }
+ }
+ if (!foundDefault) {
+ String errorMessage = "An entry with any sender and any project should be defined "
+ + "to be use as default issue creation setting";
+ context.buildConstraintViolationWithTemplate(errorMessage)
+ .addPropertyNode(PROP_ISSUE_CREATION_SETTINGS)
+ .addConstraintViolation();
+ isValid = false;
+ }
+
+ if (!isValid)
+ context.disableDefaultConstraintViolation();
+
+ return isValid;
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/notificationtemplate/NotificationTemplateSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/notificationtemplate/NotificationTemplateSetting.java
index 1b41cc5323..61f7d71a61 100644
--- 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
@@ -31,7 +31,7 @@ public class NotificationTemplateSetting implements Serializable {
+ "When evaluating this template, below variables will be available:"
+ "<ul class='mb-0'>"
+ "<li><code>event:</code> <a href='https://code.onedev.io/projects/onedev-server/blob/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>eventSummary:</code> a string representing summary of the event. May be <code>null</code>"
+ "<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"
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
index b02159d170..fbbccb4193 100644
--- 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
@@ -1,6 +1,8 @@
<%
- print "<b>${eventSummary}</b>"
- print "<br><br>"
+ if (eventSummary != null) {
+ print "<b>${eventSummary}</b>"
+ print "<br><br>"
+ }
if (eventBody != null) {
print eventBody
@@ -21,7 +23,7 @@
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 or participated previously in this topic.
+ are participating in this topic.
"""
if (unsubscribable.getEmailAddress() != null)
print """
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueBatchUpdateData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueBatchUpdateData.java
index 88be8fa6b9..0d94d05b2a 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueBatchUpdateData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueBatchUpdateData.java
@@ -5,15 +5,9 @@ import java.util.Map;
import javax.annotation.Nullable;
-import org.apache.wicket.Component;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.IssueChangeManager;
-import io.onedev.server.model.IssueChange;
import io.onedev.server.model.Milestone;
import io.onedev.server.util.CommentAware;
import io.onedev.server.util.Input;
-import io.onedev.server.web.component.issue.activities.activity.IssueFieldChangePanel;
public class IssueBatchUpdateData extends IssueFieldChangeData {
@@ -96,21 +90,6 @@ public class IssueBatchUpdateData extends IssueFieldChangeData {
};
}
- @Override
- public Component render(String componentId, IssueChange change) {
- Long changeId = change.getId();
- return new IssueFieldChangePanel(componentId, true) {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- protected IssueChange getChange() {
- return OneDev.getInstance(IssueChangeManager.class).load(changeId);
- }
-
- };
- }
-
@Override
public String getActivity() {
return "batch edited";
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueChangeData.java
index 8b445d83de..31755290d9 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueChangeData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueChangeData.java
@@ -6,26 +6,29 @@ import java.util.Map;
import javax.annotation.Nullable;
-import org.apache.wicket.Component;
-
import io.onedev.server.model.Group;
-import io.onedev.server.model.IssueChange;
import io.onedev.server.model.User;
+import io.onedev.server.notification.ActivityDetail;
import io.onedev.server.util.CommentAware;
-public interface IssueChangeData extends Serializable {
-
- Component render(String componentId, IssueChange change);
+public abstract class IssueChangeData implements Serializable {
- String getActivity();
+ private static final long serialVersionUID = 1L;
+
+ public abstract String getActivity();
@Nullable
- CommentAware getCommentAware();
+ public abstract CommentAware getCommentAware();
- Map<String, Collection<User>> getNewUsers();
+ public abstract Map<String, Collection<User>> getNewUsers();
- Map<String, Group> getNewGroups();
+ public abstract Map<String, Group> getNewGroups();
- boolean affectsBoards();
+ public abstract boolean affectsBoards();
+
+ @Nullable
+ public ActivityDetail getActivityDetail() {
+ return null;
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueDescriptionChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueDescriptionChangeData.java
deleted file mode 100644
index d1a70c62b4..0000000000
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueDescriptionChangeData.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package io.onedev.server.model.support.issue.changedata;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.wicket.Component;
-
-import io.onedev.server.model.Group;
-import io.onedev.server.model.IssueChange;
-import io.onedev.server.model.User;
-import io.onedev.server.util.CommentAware;
-
-public class IssueDescriptionChangeData implements IssueChangeData {
-
- private static final long serialVersionUID = 1L;
-
- private final String oldDescription;
-
- private final String newDescription;
-
- public IssueDescriptionChangeData(String oldDescription, String newDescription) {
- this.oldDescription = oldDescription;
- this.newDescription = newDescription;
- }
-
- public String getOldDescription() {
- return oldDescription;
- }
-
- public String getNewDescription() {
- return newDescription;
- }
-
- @Override
- public Component render(String componentId, IssueChange change) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public String getActivity() {
- return "changed description";
- }
-
- @Override
- public CommentAware getCommentAware() {
- return null;
- }
-
- @Override
- public Map<String, Collection<User>> getNewUsers() {
- return new HashMap<>();
- }
-
- @Override
- public Map<String, Group> getNewGroups() {
- return new HashMap<>();
- }
-
- @Override
- public boolean affectsBoards() {
- return false;
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueFieldChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueFieldChangeData.java
index 644e37ccd6..b98779844c 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueFieldChangeData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueFieldChangeData.java
@@ -9,21 +9,18 @@ import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
-import org.apache.wicket.Component;
-
import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.GroupManager;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.Group;
-import io.onedev.server.model.IssueChange;
import io.onedev.server.model.User;
import io.onedev.server.model.support.issue.field.spec.FieldSpec;
+import io.onedev.server.notification.ActivityDetail;
import io.onedev.server.util.CommentAware;
import io.onedev.server.util.Input;
-import io.onedev.server.web.component.propertychangepanel.PropertyChangePanel;
-public class IssueFieldChangeData implements IssueChangeData {
+public class IssueFieldChangeData extends IssueChangeData {
private static final long serialVersionUID = 1L;
@@ -63,11 +60,6 @@ public class IssueFieldChangeData implements IssueChangeData {
return field.getName() + ": " + StringUtils.join(field.getValues(), ", ");
}
- @Override
- public Component render(String componentId, IssueChange change) {
- return new PropertyChangePanel(componentId, getOldFieldValues(), getNewFieldValues(), false);
- }
-
@Override
public String getActivity() {
return "changed fields";
@@ -80,11 +72,6 @@ public class IssueFieldChangeData implements IssueChangeData {
return lines;
}
- @Override
- public CommentAware getCommentAware() {
- return null;
- }
-
@Override
public Map<String, Collection<User>> getNewUsers() {
UserManager userManager = OneDev.getInstance(UserManager.class);
@@ -151,4 +138,14 @@ public class IssueFieldChangeData implements IssueChangeData {
return true;
}
+ @Override
+ public CommentAware getCommentAware() {
+ return null;
+ }
+
+ @Override
+ public ActivityDetail getActivityDetail() {
+ return ActivityDetail.compare(getOldFieldValues(), getNewFieldValues(), false);
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueMilestoneChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueMilestoneChangeData.java
index 2380ff00f2..3204bc2de4 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueMilestoneChangeData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueMilestoneChangeData.java
@@ -6,17 +6,13 @@ import java.util.Map;
import javax.annotation.Nullable;
-import org.apache.wicket.Component;
-
import io.onedev.server.model.Group;
-import io.onedev.server.model.IssueChange;
import io.onedev.server.model.Milestone;
import io.onedev.server.model.User;
-import io.onedev.server.util.CollectionUtils;
+import io.onedev.server.notification.ActivityDetail;
import io.onedev.server.util.CommentAware;
-import io.onedev.server.web.component.propertychangepanel.PropertyChangePanel;
-public class IssueMilestoneChangeData implements IssueChangeData {
+public class IssueMilestoneChangeData extends IssueChangeData {
private static final long serialVersionUID = 1L;
@@ -29,14 +25,6 @@ public class IssueMilestoneChangeData implements IssueChangeData {
this.newMilestone = newMilestone!=null?newMilestone.getName():null;
}
- @Override
- public Component render(String componentId, IssueChange change) {
- return new PropertyChangePanel(componentId,
- CollectionUtils.newHashMap("Milestone", oldMilestone),
- CollectionUtils.newHashMap("Milestone", newMilestone),
- true);
- }
-
public String getOldMilestone() {
return oldMilestone;
}
@@ -69,5 +57,14 @@ public class IssueMilestoneChangeData implements IssueChangeData {
public boolean affectsBoards() {
return true;
}
+
+ @Override
+ public ActivityDetail getActivityDetail() {
+ Map<String, String> oldFieldValues = new HashMap<>();
+ oldFieldValues.put("Milestone", oldMilestone);
+ Map<String, String> newFieldValues = new HashMap<>();
+ oldFieldValues.put("Milestone", newMilestone);
+ return ActivityDetail.compare(oldFieldValues, newFieldValues, true);
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromCodeCommentData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromCodeCommentData.java
index 299a5b37aa..b1f5a0451f 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromCodeCommentData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromCodeCommentData.java
@@ -4,17 +4,17 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
-import org.apache.wicket.Component;
-
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.CodeCommentManager;
+import io.onedev.server.entityreference.ReferencedFromAware;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.Group;
-import io.onedev.server.model.IssueChange;
import io.onedev.server.model.User;
+import io.onedev.server.notification.ActivityDetail;
import io.onedev.server.rest.annotation.EntityId;
import io.onedev.server.util.CommentAware;
-import io.onedev.server.web.component.codecomment.referencedfrom.ReferencedFromCodeCommentPanel;
-public class IssueReferencedFromCodeCommentData implements IssueChangeData {
+public class IssueReferencedFromCodeCommentData extends IssueChangeData implements ReferencedFromAware<CodeComment> {
private static final long serialVersionUID = 1L;
@@ -34,11 +34,6 @@ public class IssueReferencedFromCodeCommentData implements IssueChangeData {
return "Referenced from code comment";
}
- @Override
- public Component render(String componentId, IssueChange change) {
- return new ReferencedFromCodeCommentPanel(componentId, commentId);
- }
-
@Override
public CommentAware getCommentAware() {
return null;
@@ -59,4 +54,14 @@ public class IssueReferencedFromCodeCommentData implements IssueChangeData {
return false;
}
+ @Override
+ public ActivityDetail getActivityDetail() {
+ return ActivityDetail.referencedFrom(getReferencedFrom());
+ }
+
+ @Override
+ public CodeComment getReferencedFrom() {
+ return OneDev.getInstance(CodeCommentManager.class).get(commentId);
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromIssueData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromIssueData.java
index 2277f18506..6f7034f5fd 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromIssueData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromIssueData.java
@@ -4,17 +4,17 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
-import org.apache.wicket.Component;
-
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.IssueManager;
+import io.onedev.server.entityreference.ReferencedFromAware;
import io.onedev.server.model.Group;
import io.onedev.server.model.Issue;
-import io.onedev.server.model.IssueChange;
import io.onedev.server.model.User;
+import io.onedev.server.notification.ActivityDetail;
import io.onedev.server.rest.annotation.EntityId;
import io.onedev.server.util.CommentAware;
-import io.onedev.server.web.component.issue.referencedfrom.ReferencedFromIssuePanel;
-public class IssueReferencedFromIssueData implements IssueChangeData {
+public class IssueReferencedFromIssueData extends IssueChangeData implements ReferencedFromAware<Issue> {
private static final long serialVersionUID = 1L;
@@ -29,11 +29,6 @@ public class IssueReferencedFromIssueData implements IssueChangeData {
return issueId;
}
- @Override
- public Component render(String componentId, IssueChange change) {
- return new ReferencedFromIssuePanel(componentId, issueId);
- }
-
@Override
public String getActivity() {
return "Referenced from other issue";
@@ -58,5 +53,15 @@ public class IssueReferencedFromIssueData implements IssueChangeData {
public boolean affectsBoards() {
return false;
}
-
+
+ @Override
+ public Issue getReferencedFrom() {
+ return OneDev.getInstance(IssueManager.class).get(issueId);
+ }
+
+ @Override
+ public ActivityDetail getActivityDetail() {
+ return ActivityDetail.referencedFrom(getReferencedFrom());
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromPullRequestData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromPullRequestData.java
index a84de05331..3565a1e810 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromPullRequestData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueReferencedFromPullRequestData.java
@@ -4,17 +4,17 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
-import org.apache.wicket.Component;
-
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.PullRequestManager;
+import io.onedev.server.entityreference.ReferencedFromAware;
import io.onedev.server.model.Group;
-import io.onedev.server.model.IssueChange;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
+import io.onedev.server.notification.ActivityDetail;
import io.onedev.server.rest.annotation.EntityId;
import io.onedev.server.util.CommentAware;
-import io.onedev.server.web.component.pullrequest.referencedfrom.ReferencedFromPullRequestPanel;
-public class IssueReferencedFromPullRequestData implements IssueChangeData {
+public class IssueReferencedFromPullRequestData extends IssueChangeData implements ReferencedFromAware<PullRequest> {
private static final long serialVersionUID = 1L;
@@ -29,11 +29,6 @@ public class IssueReferencedFromPullRequestData implements IssueChangeData {
return requestId;
}
- @Override
- public Component render(String componentId, IssueChange change) {
- return new ReferencedFromPullRequestPanel(componentId, requestId);
- }
-
@Override
public String getActivity() {
return "Referenced from pull request";
@@ -58,5 +53,15 @@ public class IssueReferencedFromPullRequestData implements IssueChangeData {
public boolean affectsBoards() {
return false;
}
-
+
+ @Override
+ public PullRequest getReferencedFrom() {
+ return OneDev.getInstance(PullRequestManager.class).get(requestId);
+ }
+
+ @Override
+ public ActivityDetail getActivityDetail() {
+ return ActivityDetail.referencedFrom(getReferencedFrom());
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueStateChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueStateChangeData.java
index 76356d7176..49117391a9 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueStateChangeData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueStateChangeData.java
@@ -5,14 +5,9 @@ import java.util.Map;
import javax.annotation.Nullable;
-import org.apache.wicket.Component;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.IssueChangeManager;
-import io.onedev.server.model.IssueChange;
+import io.onedev.server.notification.ActivityDetail;
import io.onedev.server.util.CommentAware;
import io.onedev.server.util.Input;
-import io.onedev.server.web.component.issue.activities.activity.IssueFieldChangePanel;
public class IssueStateChangeData extends IssueFieldChangeData {
@@ -76,25 +71,14 @@ public class IssueStateChangeData extends IssueFieldChangeData {
};
}
- @Override
- public Component render(String componentId, IssueChange change) {
- Long changeId = change.getId();
-
- return new IssueFieldChangePanel(componentId, true) {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- protected IssueChange getChange() {
- return OneDev.getInstance(IssueChangeManager.class).load(changeId);
- }
-
- };
- }
-
@Override
public String getActivity() {
return "changed state to '" + newState + "'";
}
+ @Override
+ public ActivityDetail getActivityDetail() {
+ return ActivityDetail.compare(getOldFieldValues(), getNewFieldValues(), true);
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueTitleChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueTitleChangeData.java
index c0c62aab01..73471c4006 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueTitleChangeData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueTitleChangeData.java
@@ -4,16 +4,12 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
-import org.apache.wicket.Component;
-
import io.onedev.server.model.Group;
-import io.onedev.server.model.IssueChange;
import io.onedev.server.model.User;
-import io.onedev.server.util.CollectionUtils;
+import io.onedev.server.notification.ActivityDetail;
import io.onedev.server.util.CommentAware;
-import io.onedev.server.web.component.propertychangepanel.PropertyChangePanel;
-public class IssueTitleChangeData implements IssueChangeData {
+public class IssueTitleChangeData extends IssueChangeData {
private static final long serialVersionUID = 1L;
@@ -26,14 +22,6 @@ public class IssueTitleChangeData implements IssueChangeData {
this.newTitle = newTitle;
}
- @Override
- public Component render(String componentId, IssueChange change) {
- return new PropertyChangePanel(componentId,
- CollectionUtils.newHashMap("Title", oldTitle),
- CollectionUtils.newHashMap("Title", newTitle),
- true);
- }
-
@Override
public String getActivity() {
return "changed title";
@@ -58,5 +46,14 @@ public class IssueTitleChangeData implements IssueChangeData {
public boolean affectsBoards() {
return false;
}
+
+ @Override
+ public ActivityDetail getActivityDetail() {
+ Map<String, String> oldFieldValues = new HashMap<>();
+ oldFieldValues.put("Title", oldTitle);
+ Map<String, String> newFieldValues = new HashMap<>();
+ oldFieldValues.put("Title", newTitle);
+ return ActivityDetail.compare(oldFieldValues, newFieldValues, true);
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestApproveData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestApproveData.java
index 91a231c512..5d88e2b132 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestApproveData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestApproveData.java
@@ -2,14 +2,9 @@ package io.onedev.server.model.support.pullrequest.changedata;
import javax.annotation.Nullable;
-import org.apache.wicket.Component;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.PullRequestChangeManager;
-import io.onedev.server.model.PullRequestChange;
import io.onedev.server.util.CommentAware;
-public class PullRequestApproveData implements PullRequestChangeData {
+public class PullRequestApproveData extends PullRequestChangeData {
private static final long serialVersionUID = 1L;
@@ -24,21 +19,6 @@ public class PullRequestApproveData implements PullRequestChangeData {
return "approved";
}
- @Override
- public Component render(String componentId, PullRequestChange change) {
- Long changeId = change.getId();
- return new PullRequestChangeCommentPanel(componentId) {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- protected PullRequestChange getChange() {
- return OneDev.getInstance(PullRequestChangeManager.class).load(changeId);
- }
-
- };
- }
-
@Override
public CommentAware getCommentAware() {
return new CommentAware() {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestAssigneeAddData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestAssigneeAddData.java
index 923c822e12..3de4323544 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestAssigneeAddData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestAssigneeAddData.java
@@ -1,11 +1,8 @@
package io.onedev.server.model.support.pullrequest.changedata;
-import org.apache.wicket.Component;
-
-import io.onedev.server.model.PullRequestChange;
import io.onedev.server.util.CommentAware;
-public class PullRequestAssigneeAddData implements PullRequestChangeData {
+public class PullRequestAssigneeAddData extends PullRequestChangeData {
private static final long serialVersionUID = 1L;
@@ -25,9 +22,4 @@ public class PullRequestAssigneeAddData implements PullRequestChangeData {
return null;
}
- @Override
- public Component render(String componentId, PullRequestChange change) {
- return null;
- }
-
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestAssigneeRemoveData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestAssigneeRemoveData.java
index 01f64f0c34..7777bc6d61 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestAssigneeRemoveData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestAssigneeRemoveData.java
@@ -1,11 +1,8 @@
package io.onedev.server.model.support.pullrequest.changedata;
-import org.apache.wicket.Component;
-
-import io.onedev.server.model.PullRequestChange;
import io.onedev.server.util.CommentAware;
-public class PullRequestAssigneeRemoveData implements PullRequestChangeData {
+public class PullRequestAssigneeRemoveData extends PullRequestChangeData {
private static final long serialVersionUID = 1L;
@@ -25,9 +22,4 @@ public class PullRequestAssigneeRemoveData implements PullRequestChangeData {
return null;
}
- @Override
- public Component render(String componentId, PullRequestChange change) {
- return null;
- }
-
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestChangeCommentPanel.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestChangeCommentPanel.java
deleted file mode 100644
index f1829186af..0000000000
--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestChangeCommentPanel.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package io.onedev.server.model.support.pullrequest.changedata;
-
-import java.util.List;
-
-import org.apache.wicket.ajax.AjaxRequestTarget;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.PullRequestChangeManager;
-import io.onedev.server.entitymanager.UserManager;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.PullRequestChange;
-import io.onedev.server.model.User;
-import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.web.component.markdown.AttachmentSupport;
-import io.onedev.server.web.component.markdown.ContentVersionSupport;
-import io.onedev.server.web.component.project.comment.ProjectCommentPanel;
-import io.onedev.server.web.util.DeleteCallback;
-import io.onedev.server.web.util.ProjectAttachmentSupport;
-
-@SuppressWarnings("serial")
-public abstract class PullRequestChangeCommentPanel extends ProjectCommentPanel {
-
- public PullRequestChangeCommentPanel(String id) {
- super(id);
- }
-
- @Override
- protected String getComment() {
- return getChange().getData().getCommentAware().getComment();
- }
-
- @Override
- protected List<User> getMentionables() {
- return OneDev.getInstance(UserManager.class).queryAndSort(getChange().getRequest().getParticipants());
- }
-
- @Override
- protected void onSaveComment(AjaxRequestTarget target, String comment) {
- getChange().getData().getCommentAware().setComment(comment);
- OneDev.getInstance(PullRequestChangeManager.class).save(getChange());
- }
-
- @Override
- protected Project getProject() {
- return getChange().getRequest().getTargetProject();
- }
-
- @Override
- protected AttachmentSupport getAttachmentSupport() {
- return new ProjectAttachmentSupport(getProject(), getChange().getRequest().getUUID(),
- SecurityUtils.canManagePullRequests(getProject()));
- }
-
- @Override
- protected boolean canModifyOrDeleteComment() {
- return SecurityUtils.canModifyOrDelete(getChange());
- }
-
- @Override
- protected String getRequiredLabel() {
- return null;
- }
-
- @Override
- protected ContentVersionSupport getContentVersionSupport() {
- return null;
- }
-
- @Override
- protected DeleteCallback getDeleteCallback() {
- return null;
- }
-
- protected abstract PullRequestChange getChange();
-}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestChangeData.java
index acd732c466..40b3da75a8 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestChangeData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestChangeData.java
@@ -4,18 +4,21 @@ import java.io.Serializable;
import javax.annotation.Nullable;
-import org.apache.wicket.Component;
-
-import io.onedev.server.model.PullRequestChange;
+import io.onedev.server.notification.ActivityDetail;
import io.onedev.server.util.CommentAware;
-public interface PullRequestChangeData extends Serializable {
+public abstract class PullRequestChangeData implements Serializable {
- Component render(String componentId, PullRequestChange change);
-
- String getActivity();
+ private static final long serialVersionUID = 1L;
+
+ public abstract String getActivity();
@Nullable
- CommentAware getCommentAware();
+ public abstract CommentAware getCommentAware();
+ @Nullable
+ public ActivityDetail getActivityDetail() {
+ return null;
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestDescriptionChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestDescriptionChangeData.java
deleted file mode 100644
index 57494e472b..0000000000
--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestDescriptionChangeData.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package io.onedev.server.model.support.pullrequest.changedata;
-
-import org.apache.wicket.Component;
-
-import io.onedev.server.model.PullRequestChange;
-import io.onedev.server.util.CommentAware;
-
-public class PullRequestDescriptionChangeData implements PullRequestChangeData {
-
- private static final long serialVersionUID = 1L;
-
- private final String oldDescription;
-
- private final String newDescription;
-
- public PullRequestDescriptionChangeData(String oldDescription, String newDescription) {
- this.oldDescription = oldDescription;
- this.newDescription = newDescription;
- }
-
- public String getOldDescription() {
- return oldDescription;
- }
-
- public String getNewDescription() {
- return newDescription;
- }
-
- @Override
- public String getActivity() {
- return "changed description";
- }
-
- @Override
- public Component render(String componentId, PullRequestChange change) {
- throw new UnsupportedOperationException();
- }
-
- @Override
- public CommentAware getCommentAware() {
- return null;
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestDiscardData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestDiscardData.java
index 0acea8eaa6..3b9e849225 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestDiscardData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestDiscardData.java
@@ -2,14 +2,9 @@ package io.onedev.server.model.support.pullrequest.changedata;
import javax.annotation.Nullable;
-import org.apache.wicket.Component;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.PullRequestChangeManager;
-import io.onedev.server.model.PullRequestChange;
import io.onedev.server.util.CommentAware;
-public class PullRequestDiscardData implements PullRequestChangeData {
+public class PullRequestDiscardData extends PullRequestChangeData {
private static final long serialVersionUID = 1L;
@@ -43,19 +38,4 @@ public class PullRequestDiscardData implements PullRequestChangeData {
};
}
- @Override
- public Component render(String componentId, PullRequestChange change) {
- Long changeId = change.getId();
- return new PullRequestChangeCommentPanel(componentId) {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- protected PullRequestChange getChange() {
- return OneDev.getInstance(PullRequestChangeManager.class).load(changeId);
- }
-
- };
- }
-
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestMergeData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestMergeData.java
index 06fce58af9..e0aaa61577 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestMergeData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestMergeData.java
@@ -2,12 +2,9 @@ package io.onedev.server.model.support.pullrequest.changedata;
import javax.annotation.Nullable;
-import org.apache.wicket.Component;
-
-import io.onedev.server.model.PullRequestChange;
import io.onedev.server.util.CommentAware;
-public class PullRequestMergeData implements PullRequestChangeData {
+public class PullRequestMergeData extends PullRequestChangeData {
private static final long serialVersionUID = 1L;
@@ -25,11 +22,6 @@ public class PullRequestMergeData implements PullRequestChangeData {
return "merged";
}
- @Override
- public Component render(String componentId, PullRequestChange change) {
- return null;
- }
-
@Override
public CommentAware getCommentAware() {
return null;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestMergeStrategyChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestMergeStrategyChangeData.java
index 5c13ae3177..c61386dd4c 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestMergeStrategyChangeData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestMergeStrategyChangeData.java
@@ -1,14 +1,13 @@
package io.onedev.server.model.support.pullrequest.changedata;
-import org.apache.wicket.Component;
+import java.util.HashMap;
+import java.util.Map;
-import io.onedev.server.model.PullRequestChange;
import io.onedev.server.model.support.pullrequest.MergeStrategy;
-import io.onedev.server.util.CollectionUtils;
+import io.onedev.server.notification.ActivityDetail;
import io.onedev.server.util.CommentAware;
-import io.onedev.server.web.component.propertychangepanel.PropertyChangePanel;
-public class PullRequestMergeStrategyChangeData implements PullRequestChangeData {
+public class PullRequestMergeStrategyChangeData extends PullRequestChangeData {
private static final long serialVersionUID = 1L;
@@ -26,17 +25,19 @@ public class PullRequestMergeStrategyChangeData implements PullRequestChangeData
return "changed merge strategy";
}
- @Override
- public Component render(String componentId, PullRequestChange change) {
- return new PropertyChangePanel(componentId,
- CollectionUtils.newHashMap("Merge Strategy", oldStrategy.toString()),
- CollectionUtils.newHashMap("Merge Strategy", newStrategy.toString()),
- true);
- }
-
@Override
public CommentAware getCommentAware() {
return null;
}
+ @Override
+ public ActivityDetail getActivityDetail() {
+ Map<String, String> oldProperties = new HashMap<>();
+ oldProperties.put("Merge Strategy", oldStrategy.name());
+ Map<String, String> newProperties = new HashMap<>();
+ oldProperties.put("Merge Strategy", newStrategy.name());
+
+ return ActivityDetail.compare(oldProperties, newProperties, true);
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromCodeCommentData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromCodeCommentData.java
index 138f09069b..a80544260d 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromCodeCommentData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromCodeCommentData.java
@@ -1,14 +1,15 @@
package io.onedev.server.model.support.pullrequest.changedata;
-import org.apache.wicket.Component;
-
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.CodeCommentManager;
+import io.onedev.server.entityreference.ReferencedFromAware;
import io.onedev.server.model.CodeComment;
-import io.onedev.server.model.PullRequestChange;
+import io.onedev.server.notification.ActivityDetail;
import io.onedev.server.rest.annotation.EntityId;
import io.onedev.server.util.CommentAware;
-import io.onedev.server.web.component.codecomment.referencedfrom.ReferencedFromCodeCommentPanel;
-public class PullRequestReferencedFromCodeCommentData implements PullRequestChangeData {
+public class PullRequestReferencedFromCodeCommentData
+ extends PullRequestChangeData implements ReferencedFromAware<CodeComment> {
private static final long serialVersionUID = 1L;
@@ -23,11 +24,6 @@ public class PullRequestReferencedFromCodeCommentData implements PullRequestChan
return commentId;
}
- @Override
- public Component render(String componentId, PullRequestChange change) {
- return new ReferencedFromCodeCommentPanel(componentId, commentId);
- }
-
@Override
public String getActivity() {
return "Referenced from code comment";
@@ -38,4 +34,14 @@ public class PullRequestReferencedFromCodeCommentData implements PullRequestChan
return null;
}
+ @Override
+ public CodeComment getReferencedFrom() {
+ return OneDev.getInstance(CodeCommentManager.class).get(commentId);
+ }
+
+ @Override
+ public ActivityDetail getActivityDetail() {
+ return ActivityDetail.referencedFrom(getReferencedFrom());
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromIssueData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromIssueData.java
index 54f262d093..c77cab184e 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromIssueData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromIssueData.java
@@ -1,14 +1,15 @@
package io.onedev.server.model.support.pullrequest.changedata;
-import org.apache.wicket.Component;
-
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.IssueManager;
+import io.onedev.server.entityreference.ReferencedFromAware;
import io.onedev.server.model.Issue;
-import io.onedev.server.model.PullRequestChange;
+import io.onedev.server.notification.ActivityDetail;
import io.onedev.server.rest.annotation.EntityId;
import io.onedev.server.util.CommentAware;
-import io.onedev.server.web.component.issue.referencedfrom.ReferencedFromIssuePanel;
-public class PullRequestReferencedFromIssueData implements PullRequestChangeData {
+public class PullRequestReferencedFromIssueData
+ extends PullRequestChangeData implements ReferencedFromAware<Issue> {
private static final long serialVersionUID = 1L;
@@ -23,11 +24,6 @@ public class PullRequestReferencedFromIssueData implements PullRequestChangeData
return issueId;
}
- @Override
- public Component render(String componentId, PullRequestChange change) {
- return new ReferencedFromIssuePanel(componentId, issueId);
- }
-
@Override
public String getActivity() {
return "Referenced from issue";
@@ -38,4 +34,14 @@ public class PullRequestReferencedFromIssueData implements PullRequestChangeData
return null;
}
+ @Override
+ public Issue getReferencedFrom() {
+ return OneDev.getInstance(IssueManager.class).get(issueId);
+ }
+
+ @Override
+ public ActivityDetail getActivityDetail() {
+ return ActivityDetail.referencedFrom(getReferencedFrom());
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromPullRequestData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromPullRequestData.java
index 0e8d223d76..e8371d9bb6 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromPullRequestData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReferencedFromPullRequestData.java
@@ -1,14 +1,15 @@
package io.onedev.server.model.support.pullrequest.changedata;
-import org.apache.wicket.Component;
-
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.PullRequestManager;
+import io.onedev.server.entityreference.ReferencedFromAware;
import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.PullRequestChange;
+import io.onedev.server.notification.ActivityDetail;
import io.onedev.server.rest.annotation.EntityId;
import io.onedev.server.util.CommentAware;
-import io.onedev.server.web.component.pullrequest.referencedfrom.ReferencedFromPullRequestPanel;
-public class PullRequestReferencedFromPullRequestData implements PullRequestChangeData {
+public class PullRequestReferencedFromPullRequestData
+ extends PullRequestChangeData implements ReferencedFromAware<PullRequest> {
private static final long serialVersionUID = 1L;
@@ -23,11 +24,6 @@ public class PullRequestReferencedFromPullRequestData implements PullRequestChan
return requestId;
}
- @Override
- public Component render(String componentId, PullRequestChange change) {
- return new ReferencedFromPullRequestPanel(componentId, requestId);
- }
-
@Override
public String getActivity() {
return "Referenced from other pull request";
@@ -38,4 +34,14 @@ public class PullRequestReferencedFromPullRequestData implements PullRequestChan
return null;
}
+ @Override
+ public PullRequest getReferencedFrom() {
+ return OneDev.getInstance(PullRequestManager.class).get(requestId);
+ }
+
+ @Override
+ public ActivityDetail getActivityDetail() {
+ return ActivityDetail.referencedFrom(getReferencedFrom());
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReopenData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReopenData.java
index a717fb514b..cc83b2d6ec 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReopenData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReopenData.java
@@ -2,14 +2,9 @@ package io.onedev.server.model.support.pullrequest.changedata;
import javax.annotation.Nullable;
-import org.apache.wicket.Component;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.PullRequestChangeManager;
-import io.onedev.server.model.PullRequestChange;
import io.onedev.server.util.CommentAware;
-public class PullRequestReopenData implements PullRequestChangeData {
+public class PullRequestReopenData extends PullRequestChangeData {
private static final long serialVersionUID = 1L;
@@ -43,19 +38,4 @@ public class PullRequestReopenData implements PullRequestChangeData {
};
}
- @Override
- public Component render(String componentId, PullRequestChange change) {
- Long changeId = change.getId();
- return new PullRequestChangeCommentPanel(componentId) {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- protected PullRequestChange getChange() {
- return OneDev.getInstance(PullRequestChangeManager.class).load(changeId);
- }
-
- };
- }
-
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestRequestedForChangesData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestRequestedForChangesData.java
index bbfd33d414..e699a09959 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestRequestedForChangesData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestRequestedForChangesData.java
@@ -2,14 +2,9 @@ package io.onedev.server.model.support.pullrequest.changedata;
import javax.annotation.Nullable;
-import org.apache.wicket.Component;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.PullRequestChangeManager;
-import io.onedev.server.model.PullRequestChange;
import io.onedev.server.util.CommentAware;
-public class PullRequestRequestedForChangesData implements PullRequestChangeData {
+public class PullRequestRequestedForChangesData extends PullRequestChangeData {
private static final long serialVersionUID = 1L;
@@ -43,19 +38,4 @@ public class PullRequestRequestedForChangesData implements PullRequestChangeData
};
}
- @Override
- public Component render(String componentId, PullRequestChange change) {
- Long changeId = change.getId();
- return new PullRequestChangeCommentPanel(componentId) {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- protected PullRequestChange getChange() {
- return OneDev.getInstance(PullRequestChangeManager.class).load(changeId);
- }
-
- };
- }
-
-}
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReviewerAddData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReviewerAddData.java
index a944e88fb6..3fcb374a5e 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReviewerAddData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReviewerAddData.java
@@ -1,11 +1,8 @@
package io.onedev.server.model.support.pullrequest.changedata;
-import org.apache.wicket.Component;
-
-import io.onedev.server.model.PullRequestChange;
import io.onedev.server.util.CommentAware;
-public class PullRequestReviewerAddData implements PullRequestChangeData {
+public class PullRequestReviewerAddData extends PullRequestChangeData {
private static final long serialVersionUID = 1L;
@@ -25,9 +22,4 @@ public class PullRequestReviewerAddData implements PullRequestChangeData {
return null;
}
- @Override
- public Component render(String componentId, PullRequestChange change) {
- return null;
- }
-
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReviewerRemoveData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReviewerRemoveData.java
index 6b45af7485..118fac1dc4 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReviewerRemoveData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestReviewerRemoveData.java
@@ -1,11 +1,8 @@
package io.onedev.server.model.support.pullrequest.changedata;
-import org.apache.wicket.Component;
-
-import io.onedev.server.model.PullRequestChange;
import io.onedev.server.util.CommentAware;
-public class PullRequestReviewerRemoveData implements PullRequestChangeData {
+public class PullRequestReviewerRemoveData extends PullRequestChangeData {
private static final long serialVersionUID = 1L;
@@ -25,9 +22,4 @@ public class PullRequestReviewerRemoveData implements PullRequestChangeData {
return null;
}
- @Override
- public Component render(String componentId, PullRequestChange change) {
- return null;
- }
-
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestSourceBranchDeleteData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestSourceBranchDeleteData.java
index f6abb6ddc6..69c3a888e8 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestSourceBranchDeleteData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestSourceBranchDeleteData.java
@@ -2,14 +2,9 @@ package io.onedev.server.model.support.pullrequest.changedata;
import javax.annotation.Nullable;
-import org.apache.wicket.Component;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.PullRequestChangeManager;
-import io.onedev.server.model.PullRequestChange;
import io.onedev.server.util.CommentAware;
-public class PullRequestSourceBranchDeleteData implements PullRequestChangeData {
+public class PullRequestSourceBranchDeleteData extends PullRequestChangeData {
private static final long serialVersionUID = 1L;
@@ -43,19 +38,4 @@ public class PullRequestSourceBranchDeleteData implements PullRequestChangeData
};
}
- @Override
- public Component render(String componentId, PullRequestChange change) {
- Long changeId = change.getId();
- return new PullRequestChangeCommentPanel(componentId) {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- protected PullRequestChange getChange() {
- return OneDev.getInstance(PullRequestChangeManager.class).load(changeId);
- }
-
- };
- }
-
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestSourceBranchRestoreData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestSourceBranchRestoreData.java
index bfe8e134a4..a88f7c86f1 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestSourceBranchRestoreData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestSourceBranchRestoreData.java
@@ -2,14 +2,9 @@ package io.onedev.server.model.support.pullrequest.changedata;
import javax.annotation.Nullable;
-import org.apache.wicket.Component;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.PullRequestChangeManager;
-import io.onedev.server.model.PullRequestChange;
import io.onedev.server.util.CommentAware;
-public class PullRequestSourceBranchRestoreData implements PullRequestChangeData {
+public class PullRequestSourceBranchRestoreData extends PullRequestChangeData {
private static final long serialVersionUID = 1L;
@@ -43,19 +38,4 @@ public class PullRequestSourceBranchRestoreData implements PullRequestChangeData
};
}
- @Override
- public Component render(String componentId, PullRequestChange change) {
- Long changeId = change.getId();
- return new PullRequestChangeCommentPanel(componentId) {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- protected PullRequestChange getChange() {
- return OneDev.getInstance(PullRequestChangeManager.class).load(changeId);
- }
-
- };
- }
-
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestTitleChangeData.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestTitleChangeData.java
index 82d0c584d6..a5cee5f005 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestTitleChangeData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestTitleChangeData.java
@@ -1,13 +1,12 @@
package io.onedev.server.model.support.pullrequest.changedata;
-import org.apache.wicket.Component;
+import java.util.HashMap;
+import java.util.Map;
-import io.onedev.server.model.PullRequestChange;
-import io.onedev.server.util.CollectionUtils;
+import io.onedev.server.notification.ActivityDetail;
import io.onedev.server.util.CommentAware;
-import io.onedev.server.web.component.propertychangepanel.PropertyChangePanel;
-public class PullRequestTitleChangeData implements PullRequestChangeData {
+public class PullRequestTitleChangeData extends PullRequestChangeData {
private static final long serialVersionUID = 1L;
@@ -25,17 +24,19 @@ public class PullRequestTitleChangeData implements PullRequestChangeData {
return "changed title";
}
- @Override
- public Component render(String componentId, PullRequestChange change) {
- return new PropertyChangePanel(componentId,
- CollectionUtils.newHashMap("Title", oldTitle),
- CollectionUtils.newHashMap("Title", newTitle),
- true);
- }
-
@Override
public CommentAware getCommentAware() {
return null;
}
+ @Override
+ public ActivityDetail getActivityDetail() {
+ Map<String, String> oldProperties = new HashMap<>();
+ oldProperties.put("Title", oldTitle);
+ Map<String, String> newProperties = new HashMap<>();
+ oldProperties.put("Title", newTitle);
+
+ return ActivityDetail.compare(oldProperties, newProperties, true);
+ }
+
}
\ No newline at end of file
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 c923ee4c8d..919281f099 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
@@ -13,17 +13,14 @@ 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.MarkdownAware;
-import io.onedev.server.event.ProjectEvent;
import io.onedev.server.event.entity.EntityPersisted;
import io.onedev.server.event.issue.IssueEvent;
import io.onedev.server.event.pullrequest.PullRequestEvent;
+import io.onedev.server.markdown.MarkdownManager;
import io.onedev.server.model.AbstractEntity;
-import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequestAssignment;
import io.onedev.server.model.PullRequestReview;
import io.onedev.server.model.support.administration.notificationtemplate.NotificationTemplateSetting;
-import io.onedev.server.util.markdown.MarkdownManager;
public abstract class AbstractNotificationManager {
@@ -36,23 +33,14 @@ public abstract class AbstractNotificationManager {
this.settingManager = settingManager;
}
- protected String getHtmlBody(Event event, String eventSummary, @Nullable String eventBody,
+ protected String getHtmlBody(Event event, @Nullable String eventSummary, @Nullable String eventBody,
String eventUrl, boolean replyable, @Nullable Unsubscribable unsubscribable) {
- if (eventBody == null && event instanceof MarkdownAware) {
- eventBody = ((MarkdownAware) event).getMarkdown();
- if (eventBody != null) {
- Project project = null;
- if (event instanceof ProjectEvent)
- project = ((ProjectEvent) event).getProject();
- eventBody = markdownManager.process(markdownManager.render(eventBody), project, null, true);
- }
- }
-
String template = null;
Map<String, Object> bindings = new HashMap<>();
- eventSummary = HtmlEscape.escapeHtml5(eventSummary);
+ if (eventSummary != null)
+ eventSummary = HtmlEscape.escapeHtml5(eventSummary);
eventUrl = HtmlEscape.escapeHtml5(eventUrl);
bindings.put("event", event);
@@ -88,13 +76,11 @@ public abstract class AbstractNotificationManager {
}
}
- protected String getTextBody(Event event, String eventSummary, @Nullable String eventBody,
+ protected String getTextBody(Event event, @Nullable String eventSummary, @Nullable String eventBody,
String eventUrl, boolean replyable, @Nullable Unsubscribable unsubscribable) {
- StringBuilder textBody = new StringBuilder(eventSummary).append("\n\n");
-
- if (eventBody == null && event instanceof MarkdownAware)
- eventBody = ((MarkdownAware) event).getMarkdown();
-
+ StringBuilder textBody = new StringBuilder();
+ if (eventSummary != null)
+ textBody.append(eventSummary).append("\n\n");
if (eventBody != null)
textBody.append(eventBody).append("\n\n");
@@ -104,8 +90,8 @@ public abstract class AbstractNotificationManager {
textBody.append("Visit " + eventUrl + " for details");
if (unsubscribable != null) {
- textBody.append("\n\n---------------------------------------------\nYou received this as you "
- + "are participating or participated previously in this topic. ");
+ 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()));
diff --git a/server-core/src/main/java/io/onedev/server/notification/ActivityDetail.java b/server-core/src/main/java/io/onedev/server/notification/ActivityDetail.java
new file mode 100644
index 0000000000..bfd1d3d574
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/notification/ActivityDetail.java
@@ -0,0 +1,185 @@
+package io.onedev.server.notification;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.markup.html.basic.Label;
+import org.unbescape.html.HtmlEscape;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.UrlManager;
+import io.onedev.server.model.CodeComment;
+import io.onedev.server.model.Issue;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.util.HtmlUtils;
+import io.onedev.server.util.PropertyChange;
+import io.onedev.server.web.component.codecomment.referencedfrom.ReferencedFromCodeCommentPanel;
+import io.onedev.server.web.component.issue.referencedfrom.ReferencedFromIssuePanel;
+import io.onedev.server.web.component.pullrequest.referencedfrom.ReferencedFromPullRequestPanel;
+
+public class ActivityDetail implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private final String htmlVersion;
+
+ private final String textVersion;
+
+ public ActivityDetail(String htmlVersion, String textVersion) {
+ this.htmlVersion = htmlVersion;
+ this.textVersion = textVersion;
+ }
+
+ public String getHtmlVersion() {
+ return htmlVersion;
+ }
+
+ public String getTextVersion() {
+ return textVersion;
+ }
+
+ public Component render(String componentId) {
+ return new Label(componentId, htmlVersion).setEscapeModelStrings(false);
+ }
+
+ private static String compareAsHtml(Map<String, String> oldProperties, Map<String, String> newProperties,
+ boolean hideNameIfOnlyOneRow) {
+ List<PropertyChange> changes = PropertyChange.listOf(oldProperties, newProperties);
+
+ StringBuilder builder = new StringBuilder();
+
+ builder.append("<table class='field-compare' style='border:1px solid #EBEDF3; border-collapse:collapse;'>");
+ builder.append(" <thead>");
+ builder.append(" <tr>");
+ if (changes.size() != 1 || !hideNameIfOnlyOneRow)
+ builder.append(" <th style='padding:0.4em 0.6em; border-bottom:1px solid #EBEDF3; font-size:0.9em; text-align:left;'>Name</th>");
+ builder.append(" <th style='padding:0.4em 0.6em; border-bottom:1px solid #EBEDF3; font-size:0.9em; text-align:left;'>Previous Value</th>");
+ builder.append(" <th style='padding:0.4em 0.6em; border-bottom:1px solid #EBEDF3; font-size:0.9em; text-align:left;'>Current Value</th>");
+ builder.append(" </tr>");
+ builder.append(" </thead>");
+ builder.append(" <tbody>");
+ for (PropertyChange change: changes) {
+ builder.append("<tr>");
+ if (changes.size() != 1 || !hideNameIfOnlyOneRow) {
+ builder.append(" <td style='padding:0.4em 0.6em; border-bottom:1px solid #EBEDF3; font-size:0.9em; text-align:left;'>");
+ builder.append(HtmlUtils.formatAsHtml(change.getName()));
+ builder.append(" </td>");
+ }
+ builder.append(" <td style='padding:0.4em 0.6em; border-bottom:1px solid #EBEDF3; font-size:0.9em; text-align:left;'>");
+ if (change.getOldValue() != null)
+ builder.append(HtmlUtils.formatAsHtml(change.getOldValue()));
+ else
+ builder.append("<i>empty</i>");
+ builder.append(" </td>");
+ builder.append(" <td style='padding:0.4em 0.6em; border-bottom:1px solid #EBEDF3; font-size:0.9em; text-align:left;'>");
+ if (change.getNewValue() != null)
+ builder.append(HtmlUtils.formatAsHtml(change.getNewValue()));
+ else
+ builder.append("<i>empty</i>");
+ builder.append(" </td>");
+ builder.append("</tr>");
+ }
+ builder.append(" </tbody>");
+ builder.append(" </table>");
+
+ return builder.toString();
+ }
+
+ private static String compareAsText(Map<String, String> oldProperties, Map<String, String> newProperties,
+ boolean hideNameIfOnlyOneRow) {
+ List<PropertyChange> changes = PropertyChange.listOf(oldProperties, newProperties);
+
+ StringBuilder builder = new StringBuilder();
+
+ for (PropertyChange change: changes) {
+ builder.append("----------------------------------------\n");
+ if (changes.size() != 1 || !hideNameIfOnlyOneRow) {
+ builder.append("Name: ").append(change.getName());
+ builder.append("\n");
+ }
+ builder.append("Previous Value: ");
+ if (change.getOldValue() != null)
+ builder.append(change.getOldValue());
+ else
+ builder.append("<empty>");
+ builder.append("\n");
+ builder.append("Current Value: ");
+ if (change.getNewValue() != null)
+ builder.append(change.getNewValue());
+ else
+ builder.append("<empty>");
+ builder.append("\n");
+ }
+ builder.append("----------------------------------------\n");
+
+ return builder.toString();
+ }
+
+ public static ActivityDetail compare(Map<String, String> oldProperties, Map<String, String> newProperties,
+ boolean hideNameIfOnlyOneRow) {
+ String htmlVersion = compareAsHtml(oldProperties, newProperties, hideNameIfOnlyOneRow);
+ String textVersion = compareAsText(oldProperties, newProperties, hideNameIfOnlyOneRow);
+ return new ActivityDetail(htmlVersion, textVersion);
+ }
+
+ public static ActivityDetail referencedFrom(CodeComment comment) {
+ String url = OneDev.getInstance(UrlManager.class).urlFor(comment, null);
+ String htmlVersion = String.format("<div><a href='%s'>%s</a></div>",
+ url, HtmlEscape.escapeHtml5(comment.getMark().getPath()));
+ String textVersion = comment.getMark().getPath() + "\n";
+
+ Long commentId = comment.getId();
+
+ return new ActivityDetail(htmlVersion, textVersion) {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Component render(String componentId) {
+ return new ReferencedFromCodeCommentPanel(componentId, commentId);
+ }
+
+ };
+ }
+
+ public static ActivityDetail referencedFrom(Issue issue) {
+ String url = OneDev.getInstance(UrlManager.class).urlFor(issue);
+ String htmlVersion = String.format("<div><a href='%s'>[%s] %s</a></div>",
+ url, issue.getFQN(), HtmlEscape.escapeHtml5(issue.getTitle()));
+ String textVersion = String.format("[%s] %s\n", issue.getFQN(), issue.getTitle());
+
+ Long issueId = issue.getId();
+ return new ActivityDetail(htmlVersion, textVersion) {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Component render(String componentId) {
+ return new ReferencedFromIssuePanel(componentId, issueId);
+ }
+
+ };
+ }
+
+ public static ActivityDetail referencedFrom(PullRequest request) {
+ String url = OneDev.getInstance(UrlManager.class).urlFor(request);
+ String htmlVersion = String.format("<div><a href='%s'>[%s] %s</a></div>",
+ url, request.getFQN(), HtmlEscape.escapeHtml5(request.getTitle()));
+ String textVersion = String.format("[%s] %s\n", request.getFQN(), request.getTitle());
+
+ Long requestId = request.getId();
+ return new ActivityDetail(htmlVersion, textVersion) {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Component render(String componentId) {
+ return new ReferencedFromPullRequestPanel(componentId, requestId);
+ }
+
+ };
+ }
+
+}
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 106bb0c33c..2d3ab193b0 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
@@ -20,6 +20,7 @@ import io.onedev.server.entitymanager.UrlManager;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.event.build.BuildEvent;
import io.onedev.server.event.build.BuildUpdated;
+import io.onedev.server.markdown.MarkdownManager;
import io.onedev.server.model.Build;
import io.onedev.server.model.BuildQuerySetting;
import io.onedev.server.model.Project;
@@ -27,7 +28,6 @@ import io.onedev.server.model.User;
import io.onedev.server.model.support.NamedQuery;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.search.entity.build.BuildQuery;
-import io.onedev.server.util.markdown.MarkdownManager;
@Singleton
public class BuildNotificationManager extends AbstractNotificationManager {
@@ -64,22 +64,17 @@ public class BuildNotificationManager extends AbstractNotificationManager {
public void notify(BuildEvent event, Collection<String> emails) {
Build build = event.getBuild();
- String subject = String.format("[%s] %s - %s", build.getStatus().getDisplayName(),
- build.getProject().getName(), build.getJobName());
+ String subject = String.format("[Build %s] %s", build.getFQN(), build.getJobName());
- String summary;
- if (build.getVersion() != null)
- summary = String.format("Build %s (%s)", build.getFQN(), build.getVersion());
- else
- summary = String.format("Build %s", build.getFQN());
-
- summary += " is " + build.getStatus().getDisplayName().toLowerCase();
-
+ String summary = build.getStatus().getDisplayName();
+ if (build.getVersion() != null)
+ summary = build.getVersion() + " " + summary;
+
String url = urlManager.urlFor(build);
- String threadingReferences = build.getProject().getName() + "-build" + build.getNumber() + "@onedev";
+ String threadingReferences = "<" + build.getProject().getName() + "-build-" + build.getNumber() + "@onedev>";
String htmlBody = getHtmlBody(event, summary, null, url, false, null);
String textBody = getTextBody(event, summary, null, url, false, null);
- mailManager.sendMailAsync(Lists.newArrayList(), emails, subject, htmlBody,
+ mailManager.sendMailAsync(Lists.newArrayList(), Lists.newArrayList(), emails, subject, htmlBody,
textBody, 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 78fdc818ce..c76a000bd1 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
@@ -10,14 +10,13 @@ import io.onedev.commons.launcher.loader.Listen;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.entitymanager.UrlManager;
import io.onedev.server.entitymanager.UserManager;
-import io.onedev.server.event.MarkdownAware;
import io.onedev.server.event.codecomment.CodeCommentCreated;
import io.onedev.server.event.codecomment.CodeCommentEvent;
import io.onedev.server.event.codecomment.CodeCommentReplied;
+import io.onedev.server.markdown.MarkdownManager;
+import io.onedev.server.markdown.MentionParser;
import io.onedev.server.model.User;
import io.onedev.server.persistence.annotation.Transactional;
-import io.onedev.server.util.markdown.MarkdownManager;
-import io.onedev.server.util.markdown.MentionParser;
@Singleton
public class CodeCommentNotificationManager extends AbstractNotificationManager {
@@ -41,11 +40,11 @@ public class CodeCommentNotificationManager extends AbstractNotificationManager
@Listen
public void on(CodeCommentEvent event) {
if (event.getComment().getRequest() == null) {
- MarkdownAware markdownAware = (MarkdownAware) event;
- String markdown = markdownAware.getMarkdown();
- String rendered = markdownManager.render(markdown);
+ String markdown = event.getMarkdown();
+ String renderedMarkdown = markdownManager.render(markdown);
+ String processedMarkdown = markdownManager.process(renderedMarkdown, event.getProject(), null, true);
- for (String userName: new MentionParser().parseMentions(rendered)) {
+ for (String userName: new MentionParser().parseMentions(renderedMarkdown)) {
User user = userManager.findByName(userName);
if (user != null) {
String url;
@@ -57,14 +56,17 @@ public class CodeCommentNotificationManager extends AbstractNotificationManager
url = null;
if (url != null) {
- String subject = "[File Comment] " + event.getComment().getMark().getPath();
- String summary = String.format("%s: %s commented on file",
- event.getProject().getName(), event.getUser().getDisplayName());
- String threadingReferences = event.getComment().getProject().getName()
- + "-codecomment" + event.getComment().getId() + "@onedev";
- mailManager.sendMailAsync(Sets.newHashSet(user.getEmail()), Lists.newArrayList(), subject,
- getHtmlBody(event, summary, null, url, false, null),
- getTextBody(event, summary, null, url, false, null),
+ String subject = String.format("[Code Comment] (Mentioned You) %s:%s",
+ event.getProject().getName(), event.getComment().getMark().getPath());
+ String summary = String.format("%s added code comment",
+ event.getUser().getDisplayName());
+ String threadingReferences = "<" + event.getComment().getProject().getName()
+ + "-codecomment-" + event.getComment().getId() + "@onedev>";
+
+ mailManager.sendMailAsync(Sets.newHashSet(user.getEmail()), Lists.newArrayList(),
+ Lists.newArrayList(), subject,
+ getHtmlBody(event, summary, processedMarkdown, url, false, null),
+ getTextBody(event, summary, markdown, url, false, null),
null, 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 575481d0a4..63d9468efa 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
@@ -22,13 +22,13 @@ import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.entitymanager.UrlManager;
import io.onedev.server.event.RefUpdated;
import io.onedev.server.git.GitUtils;
+import io.onedev.server.markdown.MarkdownManager;
import io.onedev.server.model.CommitQuerySetting;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.model.support.NamedQuery;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.search.commit.CommitQuery;
-import io.onedev.server.util.markdown.MarkdownManager;
@Singleton
public class CommitNotificationManager extends AbstractNotificationManager {
@@ -99,33 +99,30 @@ public class CommitNotificationManager extends AbstractNotificationManager {
RevCommit commit = project.getRevCommit(event.getNewCommitId(), false);
if (commit != null) {
- String subject;
-
- String branchName = GitUtils.ref2branch(event.getRefName());
- if (branchName != null) {
- subject = String.format("[%s] %s", branchName, commit.getShortMessage());
- } else {
- String tagName = GitUtils.ref2tag(event.getRefName());
- if (tagName != null) {
- subject = String.format("[%s] %s", tagName, commit.getShortMessage());
- } else {
- subject = String.format("[%s] %s", event.getRefName(), commit.getShortMessage());
- }
+ String target = GitUtils.ref2branch(event.getRefName());
+ if (target == null) {
+ target = GitUtils.ref2tag(event.getRefName());
+ if (target == null)
+ target = event.getRefName();
}
-
+
+ String subject = String.format("[Commit %s:%s] (%s) %s",
+ project.getName(), GitUtils.abbreviateSHA(commit.name()), target, commit.getShortMessage());
+
String url = urlManager.urlFor(project, commit);
- String summary = String.format("Commit %s:%s - Authored by %s", project.getName(),
- GitUtils.abbreviateSHA(commit.name()), commit.getAuthorIdent().getName());
+ String summary = String.format("Authored by %s", commit.getAuthorIdent().getName());
String textMessage = GitUtils.getDetailMessage(commit);
String htmlMessage = null;
if (textMessage != null)
htmlMessage = "<pre>" + HtmlEscape.escapeHtml5(textMessage) + "</pre>";
- mailManager.sendMailAsync(Lists.newArrayList(), notifyEmails, subject,
+ String threadingReferences = "<commit-" + commit.name() + "@onedev>";
+
+ mailManager.sendMailAsync(Lists.newArrayList(), Lists.newArrayList(), notifyEmails, subject,
getHtmlBody(event, summary, htmlMessage, url, false, null),
getTextBody(event, summary, textMessage, url, false, null),
- null, null);
+ null, threadingReferences);
}
}
}
diff --git a/server-core/src/main/java/io/onedev/server/notification/DefaultMailManager.java b/server-core/src/main/java/io/onedev/server/notification/DefaultMailManager.java
index 01ea1e3211..af192e501e 100644
--- a/server-core/src/main/java/io/onedev/server/notification/DefaultMailManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/DefaultMailManager.java
@@ -15,12 +15,14 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
+import java.util.regex.Pattern;
import java.util.stream.Collectors;
import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
import javax.mail.Folder;
+import javax.mail.FolderClosedException;
import javax.mail.Message;
import javax.mail.MessagingException;
import javax.mail.Multipart;
@@ -44,6 +46,10 @@ import org.apache.shiro.authz.UnauthorizedException;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
+import org.jsoup.nodes.Node;
+import org.jsoup.nodes.TextNode;
+import org.jsoup.select.NodeTraversor;
+import org.jsoup.select.NodeVisitor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -65,6 +71,7 @@ import io.onedev.server.entitymanager.PullRequestCommentManager;
import io.onedev.server.entitymanager.PullRequestManager;
import io.onedev.server.entitymanager.PullRequestWatchManager;
import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.entitymanager.UrlManager;
import io.onedev.server.entitymanager.UserAuthorizationManager;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.event.entity.EntityPersisted;
@@ -81,9 +88,7 @@ import io.onedev.server.model.Role;
import io.onedev.server.model.Setting;
import io.onedev.server.model.User;
import io.onedev.server.model.UserAuthorization;
-import io.onedev.server.model.support.administration.DefaultProjectDesignation;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
-import io.onedev.server.model.support.administration.IssueCreationSetting;
import io.onedev.server.model.support.administration.MailSetting;
import io.onedev.server.model.support.administration.ReceiveMailSetting;
import io.onedev.server.model.support.administration.SenderAuthorization;
@@ -96,6 +101,7 @@ import io.onedev.server.security.permission.AccessProject;
import io.onedev.server.security.permission.ProjectPermission;
import io.onedev.server.security.permission.ReadCode;
import io.onedev.server.util.EmailAddress;
+import io.onedev.server.util.HtmlUtils;
import io.onedev.server.util.validation.UserNameValidator;
@Singleton
@@ -127,6 +133,8 @@ public class DefaultMailManager implements MailManager {
private final UserManager userManager;
+ private final UrlManager urlManager;
+
private volatile boolean stopping;
private volatile Thread thread;
@@ -137,7 +145,8 @@ public class DefaultMailManager implements MailManager {
UserAuthorizationManager authorizationManager, IssueManager issueManager,
IssueCommentManager issueCommentManager, IssueWatchManager issueWatchManager,
PullRequestManager pullRequestManager, PullRequestCommentManager pullRequestCommentManager,
- PullRequestWatchManager pullRequestWatchManager, ExecutorService executorService) {
+ PullRequestWatchManager pullRequestWatchManager, ExecutorService executorService,
+ UrlManager urlManager) {
this.transactionManager = transactionManager;
this.settingManager = setingManager;
this.userManager = userManager;
@@ -150,12 +159,13 @@ public class DefaultMailManager implements MailManager {
this.pullRequestCommentManager = pullRequestCommentManager;
this.pullRequestWatchManager = pullRequestWatchManager;
this.executorService = executorService;
+ this.urlManager = urlManager;
}
@Sessional
@Override
- public void sendMailAsync(Collection<String> toList, Collection<String> ccList, String subject,
- String htmlBody, String textBody, String replyAddress, String references) {
+ public void sendMailAsync(Collection<String> toList, Collection<String> ccList, Collection<String> bccList,
+ String subject, String htmlBody, String textBody, String replyAddress, String references) {
transactionManager.runAfterCommit(new Runnable() {
@Override
@@ -165,7 +175,7 @@ public class DefaultMailManager implements MailManager {
@Override
public void run() {
try {
- sendMail(toList, ccList, subject, htmlBody, textBody, replyAddress, references);
+ sendMail(toList, ccList, bccList, subject, htmlBody, textBody, replyAddress, references);
} catch (Exception e) {
logger.error("Error sending email (to: " + toList + ", subject: " + subject + ")", e);
}
@@ -194,8 +204,9 @@ public class DefaultMailManager implements MailManager {
@Override
public void sendMail(MailSetting mailSetting, Collection<String> toList, Collection<String> ccList,
- String subject, String htmlBody, String textBody, String replyAddress, String references) {
- if (toList.isEmpty() && ccList.isEmpty())
+ Collection<String> bccList, String subject, String htmlBody, String textBody,
+ String replyAddress, String references) {
+ if (toList.isEmpty() && ccList.isEmpty() && bccList.isEmpty())
return;
if (mailSetting == null)
@@ -232,6 +243,8 @@ public class DefaultMailManager implements MailManager {
email.addTo(address);
for (String address: ccList)
email.addCc(address);
+ for (String address: bccList)
+ email.addBcc(address);
email.setHostName(mailSetting.getSmtpHost());
email.setSmtpPort(mailSetting.getSmtpPort());
@@ -254,9 +267,9 @@ public class DefaultMailManager implements MailManager {
}
@Override
- public void sendMail(Collection<String> toList, Collection<String> ccList, String subject,
- String htmlBody, String textBody, String replyAddress, String references) {
- sendMail(settingManager.getMailSetting(), toList, ccList, subject, htmlBody,
+ public void sendMail(Collection<String> toList, Collection<String> ccList, Collection<String> bccList,
+ String subject, String htmlBody, String textBody, String replyAddress, String references) {
+ sendMail(settingManager.getMailSetting(), toList, ccList, bccList, subject, htmlBody,
textBody, replyAddress, references);
}
@@ -305,10 +318,13 @@ public class DefaultMailManager implements MailManager {
User user = userManager.findByEmail(from.getAddress());
+ SenderAuthorization authorization = null;
+ String designatedProject = null;
ServiceDeskSetting serviceDeskSetting = settingManager.getServiceDeskSetting();
-
- SenderAuthorization authorization = serviceDeskSetting.getSenderAuthorization(from.getAddress());
- DefaultProjectDesignation designation = serviceDeskSetting.getDefaultProjectDesignation(from.getAddress());
+ if (serviceDeskSetting != null) {
+ authorization = serviceDeskSetting.getSenderAuthorization(from.getAddress());
+ designatedProject = serviceDeskSetting.getDesignatedProject(from.getAddress());
+ }
EmailAddress systemAddress = EmailAddress.parse(mailSetting.getEmailAddress());
Collection<Issue> issues = new ArrayList<>();
@@ -327,18 +343,19 @@ public class DefaultMailManager implements MailManager {
for (InternetAddress receiver: receivers) {
EmailAddress receiverAddress = EmailAddress.parse(receiver.getAddress());
if (receiverAddress.toString().equals(systemAddress.toString())) {
- if (designation == null)
- throw new ExplicitException("No default project for sender: " + from.getAddress());
- String projectName = designation.getDefaultProject();
- Project project = projectManager.find(projectName);
- if (project == null) {
- String errorMessage = String.format(
- "Default project does not exist (sender: %s, project: %s)",
- from.getAddress(), projectName);
- throw new ExplicitException(errorMessage);
+ if (serviceDeskSetting != null) {
+ Project project = projectManager.find(designatedProject);
+ if (project == null) {
+ String errorMessage = String.format(
+ "Sender project does not exist (sender: %s, project: %s)",
+ from.getAddress(), designatedProject);
+ throw new ExplicitException(errorMessage);
+ }
+ checkPermission(from, project, new AccessProject(), user, authorization);
+ issues.add(openIssue(message, project, from, user, authorization));
+ } else {
+ throw new ExplicitException("Unable to create issue from email as service desk is not enabled");
}
- checkPermission(from, project, new AccessProject(), user, authorization);
- issues.add(openIssue(message, project, from, user, authorization));
} else if (receiverAddress.getDomain().equals(systemAddress.getDomain())
&& receiverAddress.getPrefix().startsWith(systemAddress.getPrefix() + "+")) {
String subAddress = receiverAddress.getPrefix().substring(systemAddress.getPrefix().length()+1);
@@ -351,8 +368,12 @@ public class DefaultMailManager implements MailManager {
String remaining = StringUtils.substringAfter(subAddress, "~");
if (remaining.length() == 0) {
- checkPermission(from, project, new AccessProject(), user, authorization);
- issues.add(openIssue(message, project, from, user, authorization));
+ if (serviceDeskSetting != null) {
+ checkPermission(from, project, new AccessProject(), user, authorization);
+ issues.add(openIssue(message, project, from, user, authorization));
+ } else {
+ throw new ExplicitException("Unable to create issue from email as service desk is not enabled");
+ }
} else if (remaining.startsWith("issue")) {
remaining = remaining.substring("issue".length());
Long issueNumber;
@@ -375,7 +396,8 @@ public class DefaultMailManager implements MailManager {
+ "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.";
- sendMailAsync(Lists.newArrayList(from.getAddress()), Lists.newArrayList(), subject, body, body, null, getMessageId(message));
+ sendMailAsync(Lists.newArrayList(from.getAddress()), Lists.newArrayList(), Lists.newArrayList(),
+ subject, body, body, null, getMessageId(message));
}
}
} else {
@@ -406,7 +428,8 @@ public class DefaultMailManager implements MailManager {
+ " 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.";
- sendMailAsync(Lists.newArrayList(from.getAddress()), Lists.newArrayList(), subject, body, body, null, getMessageId(message));
+ sendMailAsync(Lists.newArrayList(from.getAddress()), Lists.newArrayList(), Lists.newArrayList(),
+ subject, body, body, null, getMessageId(message));
}
}
} else {
@@ -425,7 +448,8 @@ public class DefaultMailManager implements MailManager {
for (Issue issue: issues) {
for (InternetAddress each: involved) {
user = userManager.findByEmail(each.getAddress());
- authorization = serviceDeskSetting.getSenderAuthorization(each.getAddress());
+ if (serviceDeskSetting != null)
+ authorization = serviceDeskSetting.getSenderAuthorization(each.getAddress());
try {
checkPermission(each, issue.getProject(), new AccessProject(), user, authorization);
if (user == null)
@@ -439,7 +463,8 @@ public class DefaultMailManager implements MailManager {
for (PullRequest pullRequest: pullRequests) {
for (InternetAddress each: involved) {
user = userManager.findByEmail(each.getAddress());
- authorization = serviceDeskSetting.getSenderAuthorization(each.getAddress());
+ if (serviceDeskSetting != null)
+ authorization = serviceDeskSetting.getSenderAuthorization(each.getAddress());
try {
checkPermission(each, pullRequest.getProject(), new ReadCode(), user, authorization);
if (user == null)
@@ -456,6 +481,73 @@ public class DefaultMailManager implements MailManager {
}
}
+ private void removeNodesAfter(Node node) {
+ Node current = node;
+ while (current != null) {
+ Node nextSibling = current.nextSibling();
+ while (nextSibling != null) {
+ Node temp = nextSibling.nextSibling();
+ nextSibling.remove();
+ nextSibling = temp;
+ }
+ current = current.parent();
+ }
+ }
+
+ @Nullable
+ private String stripQuotation(String content) {
+ String quotedSender = settingManager.getMailSetting().getEmailAddress();
+ Pattern pattern = Pattern.compile("(^|\\W)" + quotedSender.replace(".", "\\.") + "($|\\W)");
+
+ Document document = HtmlUtils.parse(content);
+ Element quotedSenderElement = null;
+ for (Element element: document.getElementsContainingOwnText(quotedSender)) {
+ if (pattern.matcher(element.text()).find()) {
+ quotedSenderElement = element;
+ break;
+ }
+ }
+ if (quotedSenderElement != null) {
+ Element quotedSenderBlockElement = quotedSenderElement.parent();
+ while (quotedSenderBlockElement != null
+ && !quotedSenderBlockElement.tagName().equals("div")
+ && !quotedSenderBlockElement.tagName().equals("p")) {
+ quotedSenderBlockElement = quotedSenderBlockElement.parent();
+ }
+ if (quotedSenderBlockElement != null) {
+ removeNodesAfter(quotedSenderBlockElement);
+ quotedSenderBlockElement.remove();
+ }
+ }
+
+ AtomicReference<Node> lastContentNodeRef = new AtomicReference<>(null);
+
+ new NodeTraversor(new NodeVisitor() {
+
+ @Override
+ public void tail(Node node, int depth) {
+ if (node instanceof Element && ((Element) node).tagName().equals("img")
+ || node instanceof TextNode && StringUtils.isNotBlank(((TextNode) node).getWholeText())) {
+ lastContentNodeRef.set(node);
+ }
+ }
+
+ @Override
+ public void head(Node node, int depth) {
+
+ }
+
+ }).traverse(document);
+
+ Node lastContentNode = lastContentNodeRef.get();
+ if (lastContentNode != null) {
+ removeNodesAfter(lastContentNode);
+ return document.body().html();
+ } else {
+ return null;
+ }
+ }
+
private void addComment(Issue issue, Message message, InternetAddress author,
Collection<String> receiverEmailAddresses, @Nullable User user,
@Nullable SenderAuthorization authorization) throws IOException, MessagingException {
@@ -464,8 +556,8 @@ public class DefaultMailManager implements MailManager {
if (user == null)
user = createUserIfNotExist(author, issue.getProject(), authorization.getAuthorizedRole());
comment.setUser(user);
- String content = readText(issue.getProject(), issue.getUUID(), message);
- if (StringUtils.isNotBlank(content)) {
+ String content = stripQuotation(readText(issue.getProject(), issue.getUUID(), message));
+ if (content != null) {
comment.setContent(content);
issueCommentManager.save(comment, receiverEmailAddresses);
}
@@ -479,8 +571,8 @@ public class DefaultMailManager implements MailManager {
if (user == null)
user = createUserIfNotExist(author, pullRequest.getProject(), authorization.getAuthorizedRole());
comment.setUser(user);
- String content = readText(pullRequest.getProject(), pullRequest.getUUID(), message);
- if (StringUtils.isNotBlank(content)) {
+ String content = stripQuotation(readText(pullRequest.getProject(), pullRequest.getUUID(), message));
+ if (content != null) {
comment.setContent(content);
pullRequestCommentManager.save(comment, receiverEmailAddresses);
}
@@ -519,15 +611,24 @@ public class DefaultMailManager implements MailManager {
GlobalIssueSetting issueSetting = settingManager.getIssueSetting();
issue.setState(issueSetting.getInitialStateSpec().getName());
- IssueCreationSetting issueCreationSetting = settingManager.getServiceDeskSetting()
+ List<FieldSupply> issueFields = settingManager.getServiceDeskSetting()
.getIssueCreationSetting(submitter.getAddress(), project);
- for (FieldSupply supply: issueCreationSetting.getIssueFields()) {
+ for (FieldSupply supply: issueFields) {
Object fieldValue = issueSetting.getFieldSpec(supply.getName())
.convertToObject(supply.getValueProvider().getValue());
issue.setFieldValue(supply.getName(), fieldValue);
}
issueManager.open(issue);
+
+ 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());
+
+ sendMailAsync(Lists.newArrayList(submitter.getAddress()), Lists.newArrayList(), Lists.newArrayList(),
+ "Re: " + issue.getTitle(), htmlBody, textBody, getReplyAddress(issue),
+ issue.getEffectiveThreadingReference());
return issue;
}
@@ -538,7 +639,7 @@ public class DefaultMailManager implements MailManager {
user.setName(UserNameValidator.suggestUserName(EmailAddress.parse(address.getAddress()).getPrefix()));
user.setEmail(address.getAddress());
user.setFullName(address.getPersonal());
- user.setPassword("12345");
+ user.setPassword("impossible password");
userManager.save(user);
}
@@ -712,8 +813,13 @@ public class DefaultMailManager implements MailManager {
@Override
public void run() {
try {
- while (!stopping.get())
- inboxRef.get().idle();
+ while (!stopping.get()) {
+ try {
+ inboxRef.get().idle();
+ } catch (FolderClosedException e) {
+ Thread.sleep(1000);
+ }
+ }
} catch (Exception e) {
exception.set(ExceptionUtils.unchecked(e));
} finally {
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 783828213d..7eb0739283 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
@@ -5,7 +5,6 @@ import java.util.Collection;
import java.util.Date;
import java.util.HashSet;
import java.util.Map;
-import java.util.Set;
import java.util.stream.Collectors;
import javax.inject.Inject;
@@ -19,28 +18,23 @@ import io.onedev.server.entitymanager.IssueWatchManager;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.entitymanager.UrlManager;
import io.onedev.server.entitymanager.UserManager;
-import io.onedev.server.event.MarkdownAware;
+import io.onedev.server.entityreference.ReferencedFromAware;
import io.onedev.server.event.issue.IssueChangeEvent;
import io.onedev.server.event.issue.IssueCommented;
import io.onedev.server.event.issue.IssueEvent;
import io.onedev.server.infomanager.UserInfoManager;
+import io.onedev.server.markdown.MarkdownManager;
+import io.onedev.server.markdown.MentionParser;
import io.onedev.server.model.Group;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueWatch;
import io.onedev.server.model.User;
import io.onedev.server.model.support.NamedQuery;
import io.onedev.server.model.support.QuerySetting;
-import io.onedev.server.model.support.issue.changedata.IssueChangeData;
-import io.onedev.server.model.support.issue.changedata.IssueDescriptionChangeData;
-import io.onedev.server.model.support.issue.changedata.IssueReferencedFromCodeCommentData;
-import io.onedev.server.model.support.issue.changedata.IssueReferencedFromIssueData;
-import io.onedev.server.model.support.issue.changedata.IssueReferencedFromPullRequestData;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.QueryWatchBuilder;
import io.onedev.server.search.entity.issue.IssueQuery;
-import io.onedev.server.util.markdown.MarkdownManager;
-import io.onedev.server.util.markdown.MentionParser;
@Singleton
public class IssueNotificationManager extends AbstractNotificationManager {
@@ -73,8 +67,6 @@ public class IssueNotificationManager extends AbstractNotificationManager {
Issue issue = event.getIssue();
User user = event.getUser();
- String subject = String.format("[%s] %s", issue.getState(), issue.getTitle());
-
String url;
if (event instanceof IssueCommented)
url = urlManager.urlFor(((IssueCommented)event).getComment());
@@ -82,7 +74,13 @@ public class IssueNotificationManager extends AbstractNotificationManager {
url = urlManager.urlFor(((IssueChangeEvent)event).getChange());
else
url = urlManager.urlFor(issue);
-
+
+ String summary = "[" + issue.getState() + "] ";
+ if (user != null)
+ summary = summary + user.getDisplayName() + " " + event.getActivity();
+ else
+ summary = summary + event.getActivity();
+
for (Map.Entry<User, Boolean> entry: new QueryWatchBuilder<Issue>() {
@Override
@@ -141,113 +139,102 @@ public class IssueNotificationManager extends AbstractNotificationManager {
if (!user.isSystem())
issueWatchManager.watch(issue, user, true);
}
-
+
Map<String, Group> newGroups = event.getNewGroups();
Map<String, Collection<User>> newUsers = event.getNewUsers();
String replyAddress = mailManager.getReplyAddress(issue);
boolean replyable = replyAddress != null;
- String threadingReferences = issue.getThreadingReference();
- if (threadingReferences == null)
- threadingReferences = "<" + issue.getUUID() + "@onedev>";
for (Map.Entry<String, Group> entry: newGroups.entrySet()) {
- String summary = String.format("Issue %s: %s: You", issue.getFQN(), entry.getKey());
- Set<String> emails = entry.getValue().getMembers()
- .stream()
- .filter(it->!it.equals(user))
- .map(it->it.getEmail())
- .collect(Collectors.toSet());
- mailManager.sendMailAsync(emails, Lists.newArrayList(), subject,
- getHtmlBody(event, summary, null, url, replyable, null),
- getTextBody(event, summary, null, url, replyable, null),
- replyAddress, threadingReferences);
+ String subject = String.format("[Issue %s] (%s: You) %s", issue.getFQN(), entry.getKey(), issue.getTitle());
+ String threadingReferences = String.format("<you-in-field-%s-%s@onedev>", entry.getKey(), issue.getUUID());
+ for (User member: entry.getValue().getMembers()) {
+ if (!member.equals(user)) {
+ mailManager.sendMailAsync(Sets.newHashSet(member.getEmail()),
+ Lists.newArrayList(), Lists.newArrayList(), subject,
+ getHtmlBody(event, summary, event.getHtmlBody(), url, replyable, null),
+ getTextBody(event, summary, event.getTextBody(), url, replyable, null),
+ replyAddress, threadingReferences);
+ }
+ }
for (User member: entry.getValue().getMembers())
issueWatchManager.watch(issue, member, true);
notifiedUsers.addAll(entry.getValue().getMembers());
}
+
for (Map.Entry<String, Collection<User>> entry: newUsers.entrySet()) {
- String summary = String.format("Issue %s: %s: You", issue.getFQN(), entry.getKey());
- Set<String> emails = entry.getValue()
- .stream()
- .filter(it->!it.equals(user))
- .map(it->it.getEmail())
- .collect(Collectors.toSet());
- mailManager.sendMailAsync(emails, Lists.newArrayList(), subject,
- getHtmlBody(event, summary, null, url, replyable, null),
- getTextBody(event, summary, null, url, replyable, null),
- replyAddress, threadingReferences);
+ String subject = String.format("[Issue %s] (%s: You) %s", issue.getFQN(), entry.getKey(), issue.getTitle());
+ String threadingReferences = String.format("<you-in-field-%s-%s@onedev>", entry.getKey(), issue.getUUID());
+ for (User member: entry.getValue()) {
+ if (!member.equals(user)) {
+ mailManager.sendMailAsync(Sets.newHashSet(member.getEmail()),
+ Lists.newArrayList(), Lists.newArrayList(), subject,
+ getHtmlBody(event, summary, event.getHtmlBody(), url, replyable, null),
+ getTextBody(event, summary, event.getTextBody(), url, replyable, null),
+ replyAddress, threadingReferences);
+ }
+ }
for (User each: entry.getValue())
issueWatchManager.watch(issue, each, true);
notifiedUsers.addAll(entry.getValue());
}
- Collection<User> mentionedUsers = new HashSet<>();
- if (event instanceof MarkdownAware) {
- MarkdownAware markdownAware = (MarkdownAware) event;
- String markdown = markdownAware.getMarkdown();
- if (markdown != null) {
- String rendered = markdownManager.render(markdown);
-
- for (String userName: new MentionParser().parseMentions(rendered)) {
- User mentionedUser = userManager.findByName(userName);
- if (mentionedUser != null && notifiedUsers.add(mentionedUser)) {
- issueWatchManager.watch(issue, mentionedUser, true);
- mentionedUsers.add(mentionedUser);
+ Collection<String> notifiedEmailAddresses;
+ if (event instanceof IssueCommented)
+ notifiedEmailAddresses = ((IssueCommented) event).getNotifiedEmailAddresses();
+ else
+ notifiedEmailAddresses = new ArrayList<>();
+
+ if (event.getRenderedMarkdown() != null) {
+ for (String userName: new MentionParser().parseMentions(event.getRenderedMarkdown())) {
+ User mentionedUser = userManager.findByName(userName);
+ if (mentionedUser != null) {
+ issueWatchManager.watch(issue, mentionedUser, true);
+ if (!notifiedEmailAddresses.stream().anyMatch(mentionedUser.getEmails()::contains)) {
+ String subject = String.format("[Issue %s] (Mentioned You) %s", issue.getFQN(), issue.getTitle());
+ String threadingReferences = String.format("<mentioned-%s@onedev>", issue.getUUID());
+
+ mailManager.sendMailAsync(Sets.newHashSet(mentionedUser.getEmail()),
+ Sets.newHashSet(), Sets.newHashSet(), subject,
+ getHtmlBody(event, summary, event.getHtmlBody(), url, replyable, null),
+ getTextBody(event, summary, event.getTextBody(), url, replyable, null),
+ replyAddress, threadingReferences);
+ notifiedUsers.add(mentionedUser);
}
}
}
}
-
- boolean notifyWatchers = false;
- if (event instanceof IssueChangeEvent) {
- IssueChangeData changeData = ((IssueChangeEvent) event).getChange().getData();
- if (!(changeData instanceof IssueReferencedFromCodeCommentData
- || changeData instanceof IssueReferencedFromIssueData
- || changeData instanceof IssueReferencedFromPullRequestData
- || changeData instanceof IssueDescriptionChangeData)) {
- notifyWatchers = true;
- }
- } else {
- notifyWatchers = true;
- }
-
- if (!mentionedUsers.isEmpty() || notifyWatchers) {
- Collection<User> ccUsers = new HashSet<>();
+
+ if (!(event instanceof IssueChangeEvent)
+ || !(((IssueChangeEvent) event).getChange().getData() instanceof ReferencedFromAware)) {
+ Collection<User> bccUsers = new HashSet<>();
- Collection<String> notifiedEmailAddresses;
- if (event instanceof IssueCommented)
- notifiedEmailAddresses = ((IssueCommented) event).getNotifiedEmailAddresses();
- else
- notifiedEmailAddresses = new ArrayList<>();
for (IssueWatch watch: issue.getWatches()) {
Date visitDate = userInfoManager.getIssueVisitDate(watch.getUser(), issue);
if (watch.isWatching()
&& (visitDate == null || visitDate.before(event.getDate()))
&& !notifiedUsers.contains(watch.getUser())
&& !notifiedEmailAddresses.stream().anyMatch(watch.getUser().getEmails()::contains)) {
- ccUsers.add(watch.getUser());
+ bccUsers.add(watch.getUser());
}
}
-
- if (!mentionedUsers.isEmpty() || !ccUsers.isEmpty()) {
- String summary;
- if (user != null)
- summary = String.format("Issue %s: %s %s", issue.getFQN(), user.getDisplayName(), event.getActivity());
- else
- summary = "Issue " + issue.getFQN() + ": " + event.getActivity();
-
+
+ if (!bccUsers.isEmpty()) {
+ String subject = String.format("[Issue %s] (Updated) %s", issue.getFQN(), issue.getTitle());
+
Unsubscribable unsubscribable = new Unsubscribable(mailManager.getUnsubscribeAddress(issue));
- String htmlBody = getHtmlBody(event, summary, null, url, replyable, unsubscribable);
- String textBody = getTextBody(event, summary, null, url, replyable, unsubscribable);
-
- mailManager.sendMailAsync(
- mentionedUsers.stream().map(User::getEmail).collect(Collectors.toList()),
- ccUsers.stream().map(User::getEmail).collect(Collectors.toList()),
+ String htmlBody = getHtmlBody(event, summary, event.getHtmlBody(), url, replyable, unsubscribable);
+ String textBody = getTextBody(event, summary, event.getTextBody(), url, replyable, unsubscribable);
+
+ String threadingReferences = issue.getEffectiveThreadingReference();
+ mailManager.sendMailAsync(Sets.newHashSet(), Sets.newHashSet(),
+ bccUsers.stream().map(User::getEmail).collect(Collectors.toList()),
subject, htmlBody, textBody, replyAddress, threadingReferences);
}
}
}
+
}
diff --git a/server-core/src/main/java/io/onedev/server/notification/MailManager.java b/server-core/src/main/java/io/onedev/server/notification/MailManager.java
index 214911a3fa..04b7bc0819 100644
--- a/server-core/src/main/java/io/onedev/server/notification/MailManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/MailManager.java
@@ -12,16 +12,18 @@ public interface MailManager {
public static final String TEST_SUB_ADDRESSING = "test-sub-addressing";
- void sendMail(Collection<String> toList, Collection<String> ccList, String subject,
- String htmlBody, String textBody, @Nullable String replyAddress, @Nullable String references);
+ void sendMail(Collection<String> toList, Collection<String> ccList,
+ Collection<String> bccList, String subject, String htmlBody,
+ String textBody, @Nullable String replyAddress, @Nullable String references);
void sendMail(MailSetting mailSetting, Collection<String> toList, Collection<String> ccList,
+ Collection<String> bccList, String subject, String htmlBody, String textBody,
+ @Nullable String replyAddress, @Nullable String references);
+
+ void sendMailAsync(Collection<String> toList, Collection<String> ccList, Collection<String> bccList,
String subject, String htmlBody, String textBody, @Nullable String replyAddress,
@Nullable String references);
- void sendMailAsync(Collection<String> toList, Collection<String> ccList, String subject,
- String htmlBody, String textBody, @Nullable String replyAddress, @Nullable String references);
-
@Nullable
String getReplyAddress(Issue issue);
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 9771140950..a8084a0fcf 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
@@ -10,6 +10,8 @@ import java.util.stream.Collectors;
import javax.inject.Inject;
import javax.inject.Singleton;
+import org.apache.commons.text.WordUtils;
+
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
@@ -18,7 +20,6 @@ import io.onedev.server.entitymanager.PullRequestWatchManager;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.entitymanager.UrlManager;
import io.onedev.server.entitymanager.UserManager;
-import io.onedev.server.event.MarkdownAware;
import io.onedev.server.event.entity.EntityPersisted;
import io.onedev.server.event.pullrequest.PullRequestBuildEvent;
import io.onedev.server.event.pullrequest.PullRequestChangeEvent;
@@ -30,6 +31,8 @@ import io.onedev.server.event.pullrequest.PullRequestMergePreviewCalculated;
import io.onedev.server.event.pullrequest.PullRequestOpened;
import io.onedev.server.event.pullrequest.PullRequestUpdated;
import io.onedev.server.infomanager.UserInfoManager;
+import io.onedev.server.markdown.MarkdownManager;
+import io.onedev.server.markdown.MentionParser;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestAssignment;
import io.onedev.server.model.PullRequestReview;
@@ -48,8 +51,6 @@ import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.QueryWatchBuilder;
import io.onedev.server.search.entity.pullrequest.PullRequestQuery;
import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.util.markdown.MarkdownManager;
-import io.onedev.server.util.markdown.MentionParser;
@Singleton
public class PullRequestNotificationManager extends AbstractNotificationManager {
@@ -76,23 +77,12 @@ public class PullRequestNotificationManager extends AbstractNotificationManager
this.userManager = userManager;
}
- private String getSubject(PullRequest request) {
- String state;
- if (request.isMerged())
- state = "Merged";
- else if (request.isDiscarded())
- state = "Discarded";
- else
- state = "Open";
- return String.format("[%s] %s", state, request.getTitle());
- }
-
@Transactional
@Listen
public void on(PullRequestEvent event) {
PullRequest request = event.getRequest();
User user = event.getUser();
-
+
String url;
if (event instanceof PullRequestCommented)
url = urlManager.urlFor(((PullRequestCommented)event).getComment());
@@ -178,6 +168,14 @@ public class PullRequestNotificationManager extends AbstractNotificationManager
}
}
+ String summary = "[" + request.getStatusName() + "] ";
+ if (user != null)
+ summary = summary + user.getDisplayName() + " " + event.getActivity();
+ else if (committer != null)
+ summary = summary + committer.getDisplayName() + " " + event.getActivity();
+ else
+ summary = summary + event.getActivity();
+
if (event instanceof PullRequestOpened) {
for (PullRequestReview review: request.getReviews()) {
if (review.getResult() == null) {
@@ -189,43 +187,49 @@ public class PullRequestNotificationManager extends AbstractNotificationManager
String replyAddress = mailManager.getReplyAddress(request);
boolean replyable = replyAddress != null;
- String threadingReferences = getThreadingReferences(request);
if (event instanceof PullRequestChangeEvent
&& request.getSubmitter() != null
&& !notifiedUsers.contains(request.getSubmitter())) {
PullRequestChangeEvent changeEvent = (PullRequestChangeEvent) event;
PullRequestChangeData changeData = changeEvent.getChange().getData();
- String summary = null;
- if (changeData instanceof PullRequestApproveData)
- summary = user.getDisplayName() + " approved";
- else if (changeData instanceof PullRequestRequestedForChangesData)
- summary = user.getDisplayName() + " requested changes";
- else if (changeData instanceof PullRequestDiscardData)
- summary = user.getDisplayName() + " discarded";
- if (summary != null) {
- summary = "Pull request " + request.getFQN() + ": " + summary;
+ if (changeData instanceof PullRequestApproveData
+ || changeData instanceof PullRequestRequestedForChangesData
+ || changeData instanceof PullRequestDiscardData) {
+ String subject = String.format("[Pull Request %s] (%s) %s", request.getFQN(),
+ WordUtils.capitalize(changeData.getActivity()), request.getTitle());
+ String threadingReferences = String.format("<%s-%s@onedev>",
+ changeData.getActivity().replace(' ', '-'), request.getUUID());
mailManager.sendMailAsync(Lists.newArrayList(request.getSubmitter().getEmail()),
- Lists.newArrayList(), getSubject(request),
- getHtmlBody(event, summary, null, url, replyable, null),
- getTextBody(event, summary, null, url, replyable, null),
+ Lists.newArrayList(), Lists.newArrayList(), subject,
+ getHtmlBody(event, summary, event.getHtmlBody(), url, replyable, null),
+ getTextBody(event, summary, event.getTextBody(), url, replyable, null),
replyAddress, threadingReferences);
notifiedUsers.add(request.getSubmitter());
}
}
- Collection<User> mentionedUsers = new HashSet<>();
- if (event instanceof MarkdownAware) {
- MarkdownAware markdownAware = (MarkdownAware) event;
- String markdown = markdownAware.getMarkdown();
- if (markdown != null) {
- String rendered = markdownManager.render(markdown);
-
- for (String userName: new MentionParser().parseMentions(rendered)) {
- User mentionedUser = userManager.findByName(userName);
- if (mentionedUser != null && notifiedUsers.add(mentionedUser)) {
- pullRequestWatchManager.watch(request, mentionedUser, true);
- mentionedUsers.add(mentionedUser);
- }
+ Collection<String> notifiedEmailAddresses;
+ if (event instanceof PullRequestCommented)
+ notifiedEmailAddresses = ((PullRequestCommented) event).getNotifiedEmailAddresses();
+ else
+ notifiedEmailAddresses = new ArrayList<>();
+
+ if (event.getRenderedMarkdown() != null) {
+ for (String userName: new MentionParser().parseMentions(event.getRenderedMarkdown())) {
+ User mentionedUser = userManager.findByName(userName);
+ if (mentionedUser != null) {
+ pullRequestWatchManager.watch(request, mentionedUser, true);
+ if (!notifiedEmailAddresses.stream().anyMatch(mentionedUser.getEmails()::contains)) {
+ String subject = String.format("[Pull Request %s] (Mentioned You) %s", request.getFQN(), request.getTitle());
+ String threadingReferences = String.format("<mentioned-%s@onedev>", request.getUUID());
+
+ mailManager.sendMailAsync(Sets.newHashSet(mentionedUser.getEmail()),
+ Sets.newHashSet(), Sets.newHashSet(), subject,
+ getHtmlBody(event, summary, event.getHtmlBody(), url, replyable, null),
+ getTextBody(event, summary, event.getTextBody(), url, replyable, null),
+ replyAddress, threadingReferences);
+ notifiedUsers.add(mentionedUser);
+ }
}
}
}
@@ -244,14 +248,9 @@ public class PullRequestNotificationManager extends AbstractNotificationManager
notifyWatchers = true;
}
- if (!mentionedUsers.isEmpty() || notifyWatchers) {
- Collection<User> ccUsers = new HashSet<>();
+ if (notifyWatchers) {
+ Collection<User> bccUsers = new HashSet<>();
- Collection<String> notifiedEmailAddresses;
- if (event instanceof PullRequestCommented)
- notifiedEmailAddresses = ((PullRequestCommented) event).getNotifiedEmailAddresses();
- else
- notifiedEmailAddresses = new ArrayList<>();
for (PullRequestWatch watch: request.getWatches()) {
Date visitDate = userInfoManager.getPullRequestVisitDate(watch.getUser(), request);
if (watch.isWatching()
@@ -259,34 +258,24 @@ public class PullRequestNotificationManager extends AbstractNotificationManager
&& (!(event instanceof PullRequestUpdated) || !watch.getUser().equals(request.getSubmitter()))
&& !notifiedUsers.contains(watch.getUser())
&& !notifiedEmailAddresses.stream().anyMatch(watch.getUser().getEmails()::contains)) {
- ccUsers.add(watch.getUser());
+ bccUsers.add(watch.getUser());
}
}
- if (!mentionedUsers.isEmpty() || !ccUsers.isEmpty()) {
- String summary;
- if (user != null)
- summary = String.format("Pull request %s: %s %s", request.getFQN(), user.getDisplayName(), event.getActivity());
- else if (committer != null)
- summary = String.format("Pull request %s: %s added commits", request.getFQN(), committer.getDisplayName());
- else
- summary = "Pull request " + request.getFQN() + ": " + event.getActivity();
-
+ if (!bccUsers.isEmpty()) {
+ String subject = String.format("[Pull Request %s] (Updated) %s", request.getFQN(), request.getTitle());
+ String threadingReferences = "<" + request.getUUID() + "@onedev>";
Unsubscribable unsubscribable = new Unsubscribable(mailManager.getUnsubscribeAddress(request));
- String htmlBody = getHtmlBody(event, summary, null, url, replyable, unsubscribable);
- String textBody = getTextBody(event, summary, null, url, replyable, unsubscribable);
+ String htmlBody = getHtmlBody(event, summary, event.getHtmlBody(), url, replyable, unsubscribable);
+ String textBody = getTextBody(event, summary, event.getTextBody(), url, replyable, unsubscribable);
mailManager.sendMailAsync(
- mentionedUsers.stream().map(User::getEmail).collect(Collectors.toList()),
- ccUsers.stream().map(User::getEmail).collect(Collectors.toList()),
- getSubject(request), htmlBody, textBody, replyAddress, threadingReferences);
+ Lists.newArrayList(), Lists.newArrayList(),
+ bccUsers.stream().map(User::getEmail).collect(Collectors.toList()),
+ subject, htmlBody, textBody, replyAddress, threadingReferences);
}
}
}
- private String getThreadingReferences(PullRequest request) {
- return "<" + request.getUUID() + "@onedev>";
- }
-
@Transactional
@Listen
public void on(EntityPersisted event) {
@@ -297,13 +286,15 @@ public class PullRequestNotificationManager extends AbstractNotificationManager
if (review.getResult() == null && !review.getUser().equals(SecurityUtils.getUser())) {
pullRequestWatchManager.watch(request, review.getUser(), true);
String url = urlManager.urlFor(request);
- String summary = "Pull request " + request.getFQN() + ": You are invited to review";
+ String subject = String.format("[Pull Request %s] (Review Invitation) %s",
+ request.getFQN(), request.getTitle());
+ String threadingReferences = "<review-invitation-" + request.getUUID() + "@onedev>";
String replyAddress = mailManager.getReplyAddress(request);
mailManager.sendMailAsync(Lists.newArrayList(review.getUser().getEmail()),
- Lists.newArrayList(), getSubject(request),
- getHtmlBody(event, summary, null, url, replyAddress != null, null),
- getTextBody(event, summary, null, url, replyAddress != null, null),
- replyAddress, getThreadingReferences(request));
+ Lists.newArrayList(), Lists.newArrayList(), subject,
+ getHtmlBody(event, null, null, url, replyAddress != null, null),
+ getTextBody(event, null, null, url, replyAddress != null, null),
+ replyAddress, threadingReferences);
}
} else if (event.getEntity() instanceof PullRequestAssignment) {
PullRequestAssignment assignment = (PullRequestAssignment) event.getEntity();
@@ -311,13 +302,14 @@ public class PullRequestNotificationManager extends AbstractNotificationManager
if (!assignment.getUser().equals(SecurityUtils.getUser())) {
pullRequestWatchManager.watch(request, assignment.getUser(), true);
String url = urlManager.urlFor(request);
- String summary = "Pull request " + request.getFQN() + ": You are assigned and expected to merge";
+ String subject = String.format("[Pull Request %s] (Assigned) %s", request.getFQN(), request.getTitle());
+ String threadingReferences = "<assigned-" + request.getUUID() + "@onedev>";
String replyAddress = mailManager.getReplyAddress(request);
mailManager.sendMailAsync(Lists.newArrayList(assignment.getUser().getEmail()),
- Lists.newArrayList(), getSubject(request),
- getHtmlBody(event, summary, null, url, replyAddress != null, null),
- getTextBody(event, summary, null, url, replyAddress != null, null),
- replyAddress, getThreadingReferences(request));
+ Lists.newArrayList(), Lists.newArrayList(), subject,
+ getHtmlBody(event, null, null, url, replyAddress != null, null),
+ getTextBody(event, null, null, url, replyAddress != null, null),
+ replyAddress, threadingReferences);
}
}
}
diff --git a/server-core/src/main/java/io/onedev/server/rest/IssueResource.java b/server-core/src/main/java/io/onedev/server/rest/IssueResource.java
index d6993ac383..118860a909 100644
--- a/server-core/src/main/java/io/onedev/server/rest/IssueResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/IssueResource.java
@@ -245,7 +245,7 @@ public class IssueResource {
Issue issue = issueManager.load(issueId);
if (!SecurityUtils.canModify(issue))
throw new UnauthorizedException();
- issueChangeManager.changeDescription(issue, description);
+ issueManager.saveDescription(issue, description);
return Response.ok().build();
}
diff --git a/server-core/src/main/java/io/onedev/server/rest/PullRequestResource.java b/server-core/src/main/java/io/onedev/server/rest/PullRequestResource.java
index 0dd9265531..7a956d6be9 100644
--- a/server-core/src/main/java/io/onedev/server/rest/PullRequestResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/PullRequestResource.java
@@ -289,7 +289,7 @@ public class PullRequestResource {
PullRequest request = pullRequestManager.load(requestId);
if (!SecurityUtils.canModify(request))
throw new UnauthorizedException();
- pullRequestChangeManager.changeDescription(request, description);
+ pullRequestManager.saveDescription(request, description);
return Response.ok().build();
}
diff --git a/server-core/src/main/java/io/onedev/server/ssh/DisableShellAccess.java b/server-core/src/main/java/io/onedev/server/ssh/DisableShellAccess.java
index 686e45e3a9..91544bc2e5 100644
--- a/server-core/src/main/java/io/onedev/server/ssh/DisableShellAccess.java
+++ b/server-core/src/main/java/io/onedev/server/ssh/DisableShellAccess.java
@@ -3,22 +3,24 @@ package io.onedev.server.ssh;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import org.apache.sshd.common.Factory;
+
import org.apache.sshd.server.Environment;
import org.apache.sshd.server.ExitCallback;
-import org.apache.sshd.server.SessionAware;
+import org.apache.sshd.server.channel.ChannelSession;
import org.apache.sshd.server.command.Command;
import org.apache.sshd.server.session.ServerSession;
+import org.apache.sshd.server.session.ServerSessionAware;
+import org.apache.sshd.server.shell.ShellFactory;
import org.eclipse.jgit.lib.Constants;
-public class DisableShellAccess implements Factory<Command> {
+public class DisableShellAccess implements ShellFactory {
@Override
- public Command create() {
+ public Command createShell(ChannelSession channel) {
return new WelcomeMessage();
}
- private static class WelcomeMessage implements Command, SessionAware {
+ private static class WelcomeMessage implements Command, ServerSessionAware {
private InputStream in;
private OutputStream out;
@@ -26,7 +28,7 @@ public class DisableShellAccess implements Factory<Command> {
private ExitCallback callback;
@Override
- public void start(Environment env) throws IOException {
+ public void start(ChannelSession channel, Environment env) throws IOException {
err.write(Constants.encode(generateWelcomeMessage()));
err.flush();
callback.onExit(0);
@@ -41,7 +43,7 @@ public class DisableShellAccess implements Factory<Command> {
}
@Override
- public void destroy() throws Exception {
+ public void destroy(ChannelSession channel) throws Exception {
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/ssh/SshServerLauncher.java b/server-core/src/main/java/io/onedev/server/ssh/SshServerLauncher.java
index a5f845044b..722e361c7f 100644
--- a/server-core/src/main/java/io/onedev/server/ssh/SshServerLauncher.java
+++ b/server-core/src/main/java/io/onedev/server/ssh/SshServerLauncher.java
@@ -50,7 +50,7 @@ public class SshServerLauncher {
server.setPublickeyAuthenticator(new CachingPublicKeyAuthenticator(authenticator));
server.setKeyboardInteractiveAuthenticator(null);
- server.setCommandFactory(command -> {
+ server.setCommandFactory((channel, command) -> {
for (SshCommandCreator creator: commandCreators) {
Command sshCommand = creator.createCommand(command);
if (sshCommand != null)
diff --git a/server-core/src/main/java/io/onedev/server/util/HtmlUtils.java b/server-core/src/main/java/io/onedev/server/util/HtmlUtils.java
new file mode 100644
index 0000000000..4740b3c8fc
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/util/HtmlUtils.java
@@ -0,0 +1,125 @@
+package io.onedev.server.util;
+
+import java.util.Collection;
+import java.util.regex.Matcher;
+
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Attribute;
+import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
+import org.jsoup.nodes.Node;
+import org.jsoup.nodes.TextNode;
+import org.jsoup.safety.Cleaner;
+import org.jsoup.safety.Whitelist;
+import org.unbescape.html.HtmlEscape;
+
+import com.google.common.collect.Lists;
+
+import io.onedev.commons.utils.StringUtils;
+
+public class HtmlUtils {
+
+ private static final String[] SAFE_TAGS = new String[] { "h1", "h2", "h3", "h4", "h5", "h6", "h7", "h8", "br", "b",
+ "i", "strong", "em", "a", "pre", "code", "img", "tt", "div", "ins", "del", "sup", "sub", "p", "ol", "ul",
+ "li", "table", "thead", "tbody", "tfoot", "th", "tr", "td", "rt", "rp", "blockquote", "dl", "dt", "dd",
+ "kbd", "q", "hr", "strike", "caption", "cite", "col", "colgroup", "small", "span", "u", "input", "video", "source"};
+
+ private static final String[] SAFE_ATTRIBUTES = new String[] { "abbr", "accept", "accept-charset", "accesskey",
+ "action", "align", "alt", "axis", "border", "cellpadding", "cellspacing", "char", "charoff", "charset",
+ "checked", "cite", "clear", "cols", "colspan", "color", "compact", "coords", "datetime", "details", "dir",
+ "disabled", "enctype", "for", "frame", "headers", "height", "hreflang", "hspace", "ismap", "label", "lang",
+ "longdesc", "maxlength", "media", "method", "multiple", "name", "nohref", "noshade", "nowrap", "prompt",
+ "readonly", "rel", "rev", "rows", "rowspan", "rules", "scope", "selected", "shape", "size", "span", "start",
+ "style", "summary", "tabindex", "target", "title", "type", "usemap", "valign", "value", "vspace", "width",
+ "itemprop", "class", "controls", "id"};
+
+ private static final String[] SAFE_ANCHOR_SCHEMES = new String[] { "http", "https", "mailto", };
+
+ private static final Whitelist whiteList;
+
+ static {
+ whiteList = new Whitelist() {
+
+ @Override
+ protected boolean isSafeAttribute(String tagName, Element el, Attribute attr) {
+ if (attr.getKey().startsWith("data-"))
+ return true;
+ else
+ return super.isSafeAttribute(tagName, el, attr);
+ }
+
+ };
+
+ whiteList.addTags(SAFE_TAGS)
+ .addAttributes("a", "href", "title")
+ .addAttributes("img", "align", "alt", "height", "src", "title", "width")
+ .addAttributes("div", "itemscope", "itemtype")
+ .addAttributes("source", "src")
+ .addAttributes(":all", SAFE_ATTRIBUTES)
+ .addProtocols("a", "href", SAFE_ANCHOR_SCHEMES)
+ .addProtocols("blockquote", "cite", "http", "https")
+ .addProtocols("cite", "cite", "http", "https")
+ .addProtocols("img", "src", "http", "https")
+ .addProtocols("q", "cite", "http", "https")
+ .preserveRelativeLinks(true);
+ }
+
+ public static boolean hasAncestor(Node node, Collection<String> tags) {
+ Node parent = node.parentNode();
+ while (parent != null) {
+ if (parent instanceof Element) {
+ Element e = (Element) parent;
+ if (tags.contains(e.tagName().toLowerCase())) {
+ return true;
+ }
+ }
+
+ parent = parent.parentNode();
+ }
+
+ return false;
+ }
+
+ public static boolean hasAncestor(Node node, String tag) {
+ return hasAncestor(node, Lists.newArrayList(tag));
+ }
+
+ public static void appendReplacement(Matcher matcher, Node node, String replacement) {
+ StringBuffer buffer = new StringBuffer();
+ matcher.appendReplacement(buffer, "");
+ if (buffer.length() != 0)
+ node.before(new TextNode(buffer.toString(), node.baseUri()));
+ node.before(replacement);
+ }
+
+ public static void appendTail(Matcher matcher, Node node) {
+ StringBuffer buffer = new StringBuffer();
+ matcher.appendTail(buffer);
+ if (buffer.length() != 0)
+ node.before(new TextNode(buffer.toString(), node.baseUri()));
+ node.remove();
+ }
+
+ public static Document sanitize(Document doc) {
+ return new Cleaner(whiteList).clean(doc);
+ }
+
+ public static Document parse(String html) {
+ // Use a faked baseURI, otherwise all relative urls will be stripped out
+ return Jsoup.parseBodyFragment(html, "http://localhost/sanitize");
+ }
+
+ /**
+ * Escape text and preserving line breaks and white spaces
+ * @param text
+ * @return
+ */
+ public static String formatAsHtml(String text) {
+ text = HtmlEscape.escapeHtml5(text);
+ text = StringUtils.replace(text, "\n", "<br>");
+ text = StringUtils.replace(text, " ", "&nbsp;");
+ text = StringUtils.replace(text, "\t", "&nbsp;&nbsp;&nbsp;&nbsp;");
+ return text;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/util/PropertyChange.java b/server-core/src/main/java/io/onedev/server/util/PropertyChange.java
new file mode 100644
index 0000000000..78edb9c959
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/util/PropertyChange.java
@@ -0,0 +1,66 @@
+package io.onedev.server.util;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import com.google.common.collect.MapDifference;
+import com.google.common.collect.Maps;
+import com.google.common.collect.MapDifference.ValueDifference;
+
+public class PropertyChange implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private String name;
+
+ private String oldValue;
+
+ private String newValue;
+
+ public PropertyChange(String name, String oldValue, String newValue) {
+ this.name = name;
+ this.oldValue = oldValue;
+ this.newValue = newValue;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getOldValue() {
+ return oldValue;
+ }
+
+ public void setOldValue(String oldValue) {
+ this.oldValue = oldValue;
+ }
+
+ public String getNewValue() {
+ return newValue;
+ }
+
+ public void setNewValue(String newValue) {
+ this.newValue = newValue;
+ }
+
+ public static List<PropertyChange> listOf(Map<String, String> oldProperties, Map<String, String> newProperties) {
+ List<PropertyChange> changes = new ArrayList<>();
+ MapDifference<String, String> diff = Maps.difference(oldProperties, newProperties);
+ for (Map.Entry<String, ValueDifference<String>> entry: diff.entriesDiffering().entrySet()) {
+ changes.add(new PropertyChange(entry.getKey(),
+ entry.getValue().leftValue(), entry.getValue().rightValue()));
+ }
+ for (Map.Entry<String, String> entry: diff.entriesOnlyOnLeft().entrySet())
+ changes.add(new PropertyChange(entry.getKey(), entry.getValue(), null));
+ for (Map.Entry<String, String> entry: diff.entriesOnlyOnRight().entrySet())
+ changes.add(new PropertyChange(entry.getKey(), null, entry.getValue()));
+ return changes;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/util/init/ManualConfig.java b/server-core/src/main/java/io/onedev/server/util/init/ManualConfig.java
index cc1c8ee939..7e609256e9 100644
--- a/server-core/src/main/java/io/onedev/server/util/init/ManualConfig.java
+++ b/server-core/src/main/java/io/onedev/server/util/init/ManualConfig.java
@@ -17,12 +17,20 @@ public abstract class ManualConfig implements Serializable {
private final Collection<String> excludedProperties;
+ private final boolean forceOrdinaryStyle;
+
public ManualConfig(String title, @Nullable String description, Serializable setting,
- Collection<String> excludedProperties) {
+ Collection<String> excludedProperties, boolean forceOrdinaryStyle) {
this.title = title;
this.description = description;
this.setting = setting;
this.excludedProperties = excludedProperties;
+ this.forceOrdinaryStyle = forceOrdinaryStyle;
+ }
+
+ public ManualConfig(String title, @Nullable String description, Serializable setting,
+ Collection<String> excludedProperties) {
+ this(title, description, setting, excludedProperties, false);
}
public ManualConfig(String title, @Nullable String description, Serializable setting) {
@@ -41,6 +49,10 @@ public abstract class ManualConfig implements Serializable {
return setting;
}
+ public boolean isForceOrdinaryStyle() {
+ return forceOrdinaryStyle;
+ }
+
public Collection<String> getExcludeProperties() {
return excludedProperties;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java b/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java
index 86ecc9f175..e42c086d57 100644
--- a/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java
+++ b/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java
@@ -35,9 +35,7 @@ import io.onedev.server.web.page.admin.role.RoleDetailPage;
import io.onedev.server.web.page.admin.role.RoleListPage;
import io.onedev.server.web.page.admin.serverinformation.ServerInformationPage;
import io.onedev.server.web.page.admin.serverlog.ServerLogPage;
-import io.onedev.server.web.page.admin.servicedesk.DefaultProjectDesignationListPage;
-import io.onedev.server.web.page.admin.servicedesk.IssueCreationSettingListPage;
-import io.onedev.server.web.page.admin.servicedesk.SenderAuthorizationListPage;
+import io.onedev.server.web.page.admin.servicedesk.ServiceDeskSettingPage;
import io.onedev.server.web.page.admin.ssh.SshSettingPage;
import io.onedev.server.web.page.admin.sso.SsoConnectorListPage;
import io.onedev.server.web.page.admin.sso.SsoProcessPage;
@@ -219,12 +217,8 @@ public class OneUrlMapper extends CompoundRequestMapper {
add(new DynamicPathPageMapper("administration/settings/system", SystemSettingPage.class));
add(new DynamicPathPageMapper("administration/settings/mail", MailSettingPage.class));
- add(new DynamicPathPageMapper("administration/settings/sender-authorizations",
- SenderAuthorizationListPage.class));
- add(new DynamicPathPageMapper("administration/settings/default-projects",
- DefaultProjectDesignationListPage.class));
- add(new DynamicPathPageMapper("administration/settings/issue-creation-settings",
- IssueCreationSettingListPage.class));
+ add(new DynamicPathPageMapper("administration/settings/service-desk-setting",
+ ServiceDeskSettingPage.class));
add(new DynamicPathPageMapper("administration/settings/issue-notification-template",
IssueNotificationTemplatePage.class));
add(new DynamicPathPageMapper("administration/settings/pull-request-notification-template",
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/bootstrap/css/bootstrap-custom.css b/server-core/src/main/java/io/onedev/server/web/asset/bootstrap/css/bootstrap-custom.css
index f0a651ab84..493fc3c536 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/bootstrap/css/bootstrap-custom.css
+++ b/server-core/src/main/java/io/onedev/server/web/asset/bootstrap/css/bootstrap-custom.css
@@ -2835,4 +2835,8 @@ a.badge.badge-light-dark:hover, a.badge.badge-light-dark:focus {
.form-text {
margin-top: 0.3rem;
+}
+
+.form-group {
+ margin-bottom: 1.2rem;
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/ForceOrdinaryStyleBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/ForceOrdinaryStyleBehavior.java
new file mode 100644
index 0000000000..2b0465d452
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/ForceOrdinaryStyleBehavior.java
@@ -0,0 +1,9 @@
+package io.onedev.server.web.behavior;
+
+import org.apache.wicket.behavior.Behavior;
+
+public class ForceOrdinaryStyleBehavior extends Behavior {
+
+ private static final long serialVersionUID = 1L;
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java
index d29bcfea16..137cd40bd4 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java
@@ -26,6 +26,7 @@ import com.google.common.collect.Sets;
import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.buildspec.job.Job;
+import io.onedev.server.entityreference.Referenceable;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.git.GitUtils;
import io.onedev.server.model.Build;
@@ -34,7 +35,6 @@ import io.onedev.server.model.PullRequest;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
import io.onedev.server.util.Input;
-import io.onedev.server.util.Referenceable;
import io.onedev.server.util.criteria.Criteria;
import io.onedev.server.web.behavior.WebSocketObserver;
import io.onedev.server.web.component.build.ParamValuesLabel;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/entity/reference/ReferencePanel.java b/server-core/src/main/java/io/onedev/server/web/component/entity/reference/ReferencePanel.java
index e010589c00..8a632405cb 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/entity/reference/ReferencePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/entity/reference/ReferencePanel.java
@@ -1,6 +1,6 @@
package io.onedev.server.web.component.entity.reference;
-import io.onedev.server.util.Referenceable;
+import io.onedev.server.entityreference.Referenceable;
import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;
import org.apache.wicket.markup.ComponentTag;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java
index aaeb6d0e3e..be585bcdce 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/IssueActivitiesPanel.java
@@ -33,22 +33,14 @@ import org.apache.wicket.request.http.WebResponse;
import com.google.common.collect.Lists;
import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.CodeCommentManager;
import io.onedev.server.entitymanager.IssueCommentManager;
-import io.onedev.server.entitymanager.IssueManager;
-import io.onedev.server.entitymanager.PullRequestManager;
import io.onedev.server.entitymanager.UserManager;
-import io.onedev.server.model.CodeComment;
+import io.onedev.server.entityreference.ReferencedFromAware;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueChange;
import io.onedev.server.model.IssueComment;
import io.onedev.server.model.Project;
-import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.issue.changedata.IssueDescriptionChangeData;
-import io.onedev.server.model.support.issue.changedata.IssueReferencedFromCodeCommentData;
-import io.onedev.server.model.support.issue.changedata.IssueReferencedFromIssueData;
-import io.onedev.server.model.support.issue.changedata.IssueReferencedFromPullRequestData;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
import io.onedev.server.web.behavior.WebSocketObserver;
@@ -122,22 +114,8 @@ public abstract class IssueActivitiesPanel extends Panel {
if (showChangeHistory) {
for (IssueChange change: getIssue().getChanges()) {
- if (change.getData() instanceof IssueReferencedFromIssueData) {
- IssueReferencedFromIssueData referencedFromIssueData = (IssueReferencedFromIssueData) change.getData();
- Issue issue = OneDev.getInstance(IssueManager.class).get(referencedFromIssueData.getIssueId());
- if (issue != null)
- otherActivities.add(new IssueChangeActivity(change));
- } else if (change.getData() instanceof IssueReferencedFromPullRequestData) {
- IssueReferencedFromPullRequestData referencedFromPullRequestData = (IssueReferencedFromPullRequestData) change.getData();
- PullRequest request = OneDev.getInstance(PullRequestManager.class).get(referencedFromPullRequestData.getRequestId());
- if (request != null)
- otherActivities.add(new IssueChangeActivity(change));
- } else if (change.getData() instanceof IssueReferencedFromCodeCommentData) {
- IssueReferencedFromCodeCommentData referencedFromCodeCommentData = (IssueReferencedFromCodeCommentData) change.getData();
- CodeComment comment = OneDev.getInstance(CodeCommentManager.class).get(referencedFromCodeCommentData.getCommentId());
- if (comment != null)
- otherActivities.add(new IssueChangeActivity(change));
- } else if (!(change.getData() instanceof IssueDescriptionChangeData)) {
+ if (!(change.getData() instanceof ReferencedFromAware)
+ || ((ReferencedFromAware<?>)change.getData()).getReferencedFrom() != null) {
otherActivities.add(new IssueChangeActivity(change));
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.html
index fae32ff124..168aea65ab 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.html
@@ -2,5 +2,8 @@
<div class="head">
<span wicket:id="user" class="user"></span> <span wicket:id="description"></span> <span wicket:id="age"></span>
</div>
- <div wicket:id="body" class="body"></div>
+ <div class="body">
+ <div wicket:id="detail" class="detail"></div>
+ <div wicket:id="comment" class="comment"></div>
+ </div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.java
index 954e7606e7..7f85d586bd 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueChangePanel.java
@@ -1,13 +1,28 @@
package io.onedev.server.web.component.issue.activities.activity;
+import java.util.List;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.GenericPanel;
import org.apache.wicket.model.IModel;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.IssueChangeManager;
+import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.IssueChange;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
+import io.onedev.server.notification.ActivityDetail;
+import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
+import io.onedev.server.web.component.markdown.AttachmentSupport;
+import io.onedev.server.web.component.markdown.ContentVersionSupport;
+import io.onedev.server.web.component.project.comment.ProjectCommentPanel;
+import io.onedev.server.web.util.DeleteCallback;
+import io.onedev.server.web.util.ProjectAttachmentSupport;
@SuppressWarnings("serial")
class IssueChangePanel extends GenericPanel<IssueChange> {
@@ -16,21 +31,83 @@ class IssueChangePanel extends GenericPanel<IssueChange> {
super(id, model);
}
+ private IssueChange getChange() {
+ return getModelObject();
+ }
+
@Override
protected void onInitialize() {
super.onInitialize();
- IssueChange change = getModelObject();
- if (change.getUser() != null)
- add(new Label("user", change.getUser().getDisplayName()));
+ if (getChange().getUser() != null)
+ add(new Label("user", getChange().getUser().getDisplayName()));
else
add(new WebMarkupContainer("user").setVisible(false));
- add(new Label("description", change.getData().getActivity()));
- add(new Label("age", DateUtils.formatAge(change.getDate()))
- .add(new AttributeAppender("title", DateUtils.formatDateTime(change.getDate()))));
+ add(new Label("description", getChange().getData().getActivity()));
+ add(new Label("age", DateUtils.formatAge(getChange().getDate()))
+ .add(new AttributeAppender("title", DateUtils.formatDateTime(getChange().getDate()))));
- add(change.getData().render("body", change));
+ ActivityDetail detail = getChange().getData().getActivityDetail();
+ if (detail != null)
+ add(detail.render("detail"));
+ else
+ add(new WebMarkupContainer("detail").setVisible(false));
+
+ if (getChange().getData().getCommentAware() != null) {
+ add(new ProjectCommentPanel("comment") {
+
+ @Override
+ protected String getComment() {
+ return getChange().getData().getCommentAware().getComment();
+ }
+
+ @Override
+ protected List<User> getMentionables() {
+ return OneDev.getInstance(UserManager.class).queryAndSort(getChange().getIssue().getParticipants());
+ }
+
+ @Override
+ protected void onSaveComment(AjaxRequestTarget target, String comment) {
+ getChange().getData().getCommentAware().setComment(comment);
+ OneDev.getInstance(IssueChangeManager.class).save(getChange());
+ }
+
+ @Override
+ protected Project getProject() {
+ return getChange().getIssue().getProject();
+ }
+
+ @Override
+ protected AttachmentSupport getAttachmentSupport() {
+ return new ProjectAttachmentSupport(getProject(), getChange().getIssue().getUUID(),
+ SecurityUtils.canManageIssues(getProject()));
+ }
+
+ @Override
+ protected boolean canModifyOrDeleteComment() {
+ return SecurityUtils.canModifyOrDelete(getChange());
+ }
+
+ @Override
+ protected String getRequiredLabel() {
+ return null;
+ }
+
+ @Override
+ protected ContentVersionSupport getContentVersionSupport() {
+ return null;
+ }
+
+ @Override
+ protected DeleteCallback getDeleteCallback() {
+ return null;
+ }
+
+ });
+ } else {
+ add(new WebMarkupContainer("comment").setVisible(false));
+ }
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueFieldChangePanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueFieldChangePanel.html
deleted file mode 100644
index 2d8fd167de..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueFieldChangePanel.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<wicket:panel>
- <div class="field-change">
- <div wicket:id="change" class="change"></div>
- <div wicket:id="comment" class="comment"></div>
- </div>
-</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueFieldChangePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueFieldChangePanel.java
deleted file mode 100644
index 28e7ab7d92..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueFieldChangePanel.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package io.onedev.server.web.component.issue.activities.activity;
-
-import java.util.List;
-
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.panel.Panel;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.IssueChangeManager;
-import io.onedev.server.entitymanager.UserManager;
-import io.onedev.server.model.IssueChange;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.User;
-import io.onedev.server.model.support.issue.changedata.IssueFieldChangeData;
-import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.web.component.markdown.AttachmentSupport;
-import io.onedev.server.web.component.markdown.ContentVersionSupport;
-import io.onedev.server.web.component.project.comment.ProjectCommentPanel;
-import io.onedev.server.web.component.propertychangepanel.PropertyChangePanel;
-import io.onedev.server.web.util.DeleteCallback;
-import io.onedev.server.web.util.ProjectAttachmentSupport;
-@SuppressWarnings("serial")
-public abstract class IssueFieldChangePanel extends Panel {
-
- private final boolean hideNameIfOnlyOneRow;
-
- public IssueFieldChangePanel(String id, boolean hideNameIfOnlyOneRow) {
- super(id);
- this.hideNameIfOnlyOneRow = hideNameIfOnlyOneRow;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- IssueFieldChangeData changeData = (IssueFieldChangeData) getChange().getData();
-
- add(new PropertyChangePanel("change", changeData.getOldFieldValues(), changeData.getNewFieldValues(),
- hideNameIfOnlyOneRow));
-
- if (changeData.getCommentAware() != null) {
- add(new ProjectCommentPanel("comment") {
-
- @Override
- protected String getComment() {
- return getChange().getData().getCommentAware().getComment();
- }
-
- @Override
- protected List<User> getMentionables() {
- return OneDev.getInstance(UserManager.class).queryAndSort(getChange().getIssue().getParticipants());
- }
-
- @Override
- protected void onSaveComment(AjaxRequestTarget target, String comment) {
- getChange().getData().getCommentAware().setComment(comment);
- OneDev.getInstance(IssueChangeManager.class).save(getChange());
- }
-
- @Override
- protected Project getProject() {
- return getChange().getIssue().getProject();
- }
-
- @Override
- protected AttachmentSupport getAttachmentSupport() {
- return new ProjectAttachmentSupport(getProject(), getChange().getIssue().getUUID(),
- SecurityUtils.canManageIssues(getProject()));
- }
-
- @Override
- protected boolean canModifyOrDeleteComment() {
- return SecurityUtils.canModifyOrDelete(getChange());
- }
-
- @Override
- protected String getRequiredLabel() {
- return null;
- }
-
- @Override
- protected ContentVersionSupport getContentVersionSupport() {
- return null;
- }
-
- @Override
- protected DeleteCallback getDeleteCallback() {
- return null;
- }
-
- });
- } else {
- add(new WebMarkupContainer("comment").setVisible(false));
- }
-
- }
-
- protected abstract IssueChange getChange();
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedPanel.java
index e29f2b2440..58c6cb59cd 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/activity/IssueOpenedPanel.java
@@ -9,7 +9,7 @@ import org.apache.wicket.markup.html.panel.GenericPanel;
import org.apache.wicket.model.IModel;
import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.IssueChangeManager;
+import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
@@ -47,7 +47,7 @@ class IssueOpenedPanel extends GenericPanel<Issue> {
@Override
protected void onSaveComment(AjaxRequestTarget target, String comment) {
- OneDev.getInstance(IssueChangeManager.class).changeDescription(getIssue(), comment);
+ OneDev.getInstance(IssueManager.class).saveDescription(getIssue(), comment);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/issue-activities.css b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/issue-activities.css
index df4033bd24..40aa1a7a09 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/activities/issue-activities.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/activities/issue-activities.css
@@ -34,7 +34,16 @@
.issue-activities>table>tbody>tr>td.content>.body {
margin-top: 1rem;
}
+.issue-activities>table>tbody>tr>td.content>.body>.detail+.comment {
+ margin-top: 1rem;
+}
-.issue-activities .field-change>.comment {
- margin-top: 0.8rem;
-}
\ No newline at end of file
+.issue-activities table.field-compare {
+ border: 1px dashed var(--secondary) !important;
+}
+.issue-activities table.field-compare th, .issue-activities table.field-compare td {
+ border-bottom: 1px dashed var(--secondary) !important;
+}
+.issue-activities table.field-compare th {
+ font-weight: 600 !important;
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java
index 9940cd53ff..add0d8892c 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java
@@ -43,6 +43,7 @@ import io.onedev.server.entitymanager.IssueChangeManager;
import io.onedev.server.entitymanager.IssueVoteManager;
import io.onedev.server.entitymanager.IssueWatchManager;
import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.entityreference.Referenceable;
import io.onedev.server.model.AbstractEntity;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueVote;
@@ -57,7 +58,6 @@ import io.onedev.server.search.entity.issue.StateCriteria;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.Input;
import io.onedev.server.util.IssueUtils;
-import io.onedev.server.util.Referenceable;
import io.onedev.server.web.ajaxlistener.AppendAjaxIndicatorListener;
import io.onedev.server.web.behavior.WebSocketObserver;
import io.onedev.server.web.component.entity.watches.EntityWatchesPanel;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.html b/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.html
index ed006c0fb9..4ad42779b7 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.html
@@ -32,8 +32,8 @@
<wicket:fragment wicket:id="pickAttachedImageFrag">
<ul class="attachments list-unstyled">
<li wicket:id="attachments" class="attachment image">
- <a wicket:id="select" title="Insert this image" class="insert"><img wicket:id="image"></img></a>
- <a wicket:id="delete" title="Remove this image" class="delete btn btn-light-danger"><wicket:svg href="trash" class="icon"></wicket:svg> Remove</a>
+ <a wicket:id="select" title="Insert this image" class="insert mx-auto d-block mb-2"><img wicket:id="image"></img></a>
+ <a wicket:id="delete" title="Remove this image" class="delete btn btn-light-danger">Remove</a>
</li>
</ul>
</wicket:fragment>
@@ -41,7 +41,7 @@
<ul class="attachments list-unstyled">
<li wicket:id="attachments" class="attachment file d-flex">
<a wicket:id="select" title="Insert link to this file" class="insert btn btn-block btn-light btn-hover-primary flex-grow-1 mr-2"><span wicket:id="file"></span></a>
- <a wicket:id="delete" title="Remove this file" class="delete btn btn-light btn-icon btn-hover-danger flex-shrink-0"><wicket:svg href="trash" class="icon"></wicket:svg></a>
+ <a wicket:id="delete" title="Remove this file" class="delete btn btn-light-danger btn-icon btn-hover-danger flex-shrink-0"><wicket:svg href="trash" class="icon"></wicket:svg></a>
</li>
</ul>
</wicket:fragment>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java
index 0a8a737f73..cd1d0b2665 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java
@@ -53,6 +53,7 @@ import com.google.common.base.Preconditions;
import io.onedev.commons.launcher.loader.AppLoader;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.markdown.MarkdownManager;
import io.onedev.server.model.Build;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
@@ -60,7 +61,6 @@ import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
import io.onedev.server.util.CollectionUtils;
import io.onedev.server.util.FilenameUtils;
-import io.onedev.server.util.markdown.MarkdownManager;
import io.onedev.server.util.validation.ProjectNameValidator;
import io.onedev.server.web.avatar.AvatarManager;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java
index f58ff3f6df..c1bea24cba 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java
@@ -30,6 +30,7 @@ import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.entitymanager.PullRequestManager;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.entitymanager.UserManager;
+import io.onedev.server.markdown.MarkdownManager;
import io.onedev.server.model.Build;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
@@ -39,7 +40,6 @@ import io.onedev.server.model.support.pullrequest.CloseInfo;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.ColorUtils;
import io.onedev.server.util.DateUtils;
-import io.onedev.server.util.markdown.MarkdownManager;
import io.onedev.server.web.asset.lozad.LozadResourceReference;
import io.onedev.server.web.avatar.AvatarManager;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/propertychangepanel/PropertyChangeCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/propertychangepanel/PropertyChangeCssResourceReference.java
deleted file mode 100644
index 04123b2560..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/propertychangepanel/PropertyChangeCssResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.web.component.propertychangepanel;
-
-import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
-
-public class PropertyChangeCssResourceReference extends BaseDependentCssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public PropertyChangeCssResourceReference() {
- super(PropertyChangeCssResourceReference.class, "property-change.css");
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/propertychangepanel/PropertyChangePanel.html b/server-core/src/main/java/io/onedev/server/web/component/propertychangepanel/PropertyChangePanel.html
deleted file mode 100644
index cb46ae7496..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/propertychangepanel/PropertyChangePanel.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<wicket:panel>
-<table class="property-change">
- <thead>
- <th wicket:id="nameHeader" class="name">Name</th>
- <th class="old-value value">Previous Value</th>
- <th class="new-value value">Current Value</th>
- </thead>
- <tr wicket:id="properties">
- <wicket:enclosure>
- <td class="name">
- <span wicket:id="name"></span>
- </td>
- </wicket:enclosure>
- <td class="old-value value">
- <span wicket:id="oldValue"></span>
- </td>
- <td class="new-value value">
- <span wicket:id="newValue"></span>
- </td>
- </tr>
-</table>
-</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/propertychangepanel/PropertyChangePanel.java b/server-core/src/main/java/io/onedev/server/web/component/propertychangepanel/PropertyChangePanel.java
deleted file mode 100644
index 06d342e10e..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/propertychangepanel/PropertyChangePanel.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package io.onedev.server.web.component.propertychangepanel;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.list.ListItem;
-import org.apache.wicket.markup.html.list.ListView;
-import org.apache.wicket.markup.html.panel.Panel;
-
-import com.google.common.collect.MapDifference;
-import com.google.common.collect.MapDifference.ValueDifference;
-import com.google.common.collect.Maps;
-
-@SuppressWarnings("serial")
-public class PropertyChangePanel extends Panel {
-
- private final List<PropertyChange> changes = new ArrayList<>();
-
- private final boolean showName;
-
- public PropertyChangePanel(String id, Map<String, String> oldProperties, Map<String, String> newProperties,
- boolean hideNameIfOnlyOneChange) {
- super(id);
-
- MapDifference<String, String> diff = Maps.difference(oldProperties, newProperties);
- for (Map.Entry<String, ValueDifference<String>> entry: diff.entriesDiffering().entrySet()) {
- changes.add(new PropertyChange(entry.getKey(),
- entry.getValue().leftValue(), entry.getValue().rightValue()));
- }
- for (Map.Entry<String, String> entry: diff.entriesOnlyOnLeft().entrySet())
- changes.add(new PropertyChange(entry.getKey(), entry.getValue(), null));
- for (Map.Entry<String, String> entry: diff.entriesOnlyOnRight().entrySet())
- changes.add(new PropertyChange(entry.getKey(), null, entry.getValue()));
-
- showName = !hideNameIfOnlyOneChange || changes.size() > 1;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- add(new WebMarkupContainer("nameHeader").setVisible(showName));
-
- add(new ListView<PropertyChange>("properties", changes) {
-
- @Override
- protected void populateItem(ListItem<PropertyChange> item) {
- PropertyChange change = item.getModelObject();
- item.add(new Label("name", change.name).setVisible(showName));
- if (change.oldValue != null)
- item.add(new Label("oldValue", change.oldValue));
- else
- item.add(new Label("oldValue", "<i>empty</i>").setEscapeModelStrings(false));
- if (change.newValue != null)
- item.add(new Label("newValue", change.newValue));
- else
- item.add(new Label("newValue", "<i>empty</i>").setEscapeModelStrings(false));
- }
-
- });
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new PropertyChangeCssResourceReference()));
- }
-
- private static class PropertyChange implements Serializable {
-
- private String name;
-
- private String oldValue;
-
- private String newValue;
-
- PropertyChange(String name, String oldValue, String newValue) {
- this.name = name;
- this.oldValue = oldValue;
- this.newValue = newValue;
- }
-
- }
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/propertychangepanel/property-change.css b/server-core/src/main/java/io/onedev/server/web/component/propertychangepanel/property-change.css
deleted file mode 100644
index 16c1d6f985..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/component/propertychangepanel/property-change.css
+++ /dev/null
@@ -1,15 +0,0 @@
-.property-change {
- width: auto;
- border: 1px dashed var(--secondary);
- font-size: 1rem;
-}
-.property-change td.name {
- white-space: nowrap;
-}
-.property-change th {
- font-weight: 600;
-}
-.property-change th, .property-change td {
- padding: 0.4rem 0.6rem;
- border-bottom: 1px dashed var(--secondary);
-}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/wizard/ManualConfigStep.java b/server-core/src/main/java/io/onedev/server/web/component/wizard/ManualConfigStep.java
index 4ded0bf6a7..c162473f88 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/wizard/ManualConfigStep.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/wizard/ManualConfigStep.java
@@ -7,7 +7,9 @@ import javax.annotation.Nullable;
import org.apache.wicket.markup.html.form.FormComponent;
import io.onedev.server.util.init.ManualConfig;
+import io.onedev.server.web.behavior.ForceOrdinaryStyleBehavior;
import io.onedev.server.web.editable.BeanContext;
+import io.onedev.server.web.editable.BeanEditor;
@SuppressWarnings("serial")
public class ManualConfigStep implements WizardStep {
@@ -20,7 +22,11 @@ public class ManualConfigStep implements WizardStep {
@Override
public FormComponent<Serializable> render(String componentId) {
- return BeanContext.edit(componentId, config.getSetting(), config.getExcludeProperties(), true);
+ BeanEditor editor = BeanContext.edit(componentId, config.getSetting(),
+ config.getExcludeProperties(), true);
+ if (config.isForceOrdinaryStyle())
+ editor.add(new ForceOrdinaryStyleBehavior());
+ return editor;
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java
index 07a1761907..61eea144c9 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java
@@ -25,7 +25,7 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
import io.onedev.commons.utils.ClassUtils;
-import io.onedev.commons.utils.HtmlUtils;
+import io.onedev.server.util.HtmlUtils;
import io.onedev.server.util.Path;
import io.onedev.server.util.PathNode;
import io.onedev.server.util.PathNode.Indexed;
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildMultiChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildMultiChoiceEditor.java
index d33c7c3019..5753934be9 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildMultiChoiceEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildMultiChoiceEditor.java
@@ -33,7 +33,10 @@ public class BuildMultiChoiceEditor extends PropertyEditor<List<Long>> {
}
private Project getProject() {
- return ((ProjectPage)getPage()).getProject();
+ if (getPage() instanceof ProjectPage)
+ return ((ProjectPage)getPage()).getProject();
+ else
+ return null;
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildSingleChoiceEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildSingleChoiceEditor.java
index e5d04d2c18..82db5f5290 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildSingleChoiceEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/build/choice/BuildSingleChoiceEditor.java
@@ -28,7 +28,10 @@ public class BuildSingleChoiceEditor extends PropertyEditor<Long> {
}
private Project getProject() {
- return ((ProjectPage)getPage()).getProject();
+ if (getPage() instanceof ProjectPage)
+ return ((ProjectPage)getPage()).getProject();
+ else
+ return null;
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/IssueCreationSettingEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/servicedesk/IssueCreationSettingEditPanel.html
similarity index 88%
rename from server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/IssueCreationSettingEditPanel.html
rename to server-core/src/main/java/io/onedev/server/web/editable/servicedesk/IssueCreationSettingEditPanel.html
index 81c9f94373..f0fbc1fb02 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/IssueCreationSettingEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/servicedesk/IssueCreationSettingEditPanel.html
@@ -1,15 +1,16 @@
-<wicket:panel>
- <form wicket:id="form" class="issue-creation-setting-edit leave-confirm">
- <div class="modal-header">
- <h5 id="modal-title" class="modal-title">Issue Creation Setting</h5>
- <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
- </div>
- <div class="modal-body">
- <div wicket:id="editor"></div>
- </div>
- <div class="modal-footer">
- <input wicket:id="save" type="submit" class="dirty-aware btn btn-primary" value="Save">
- <a wicket:id="cancel" class="btn btn-secondary">Cancel</a>
- </div>
- </form>
+<wicket:panel>
+ <form wicket:id="form" class="issue-creation-setting-edit leave-confirm">
+ <div class="modal-header">
+ <h5 id="modal-title" class="modal-title">Issue Creation Setting</h5>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
+ </div>
+ <div class="modal-body">
+ <div wicket:id="feedback"></div>
+ <div wicket:id="editor"></div>
+ </div>
+ <div class="modal-footer">
+ <input wicket:id="save" type="submit" class="dirty-aware btn btn-primary" value="Save">
+ <a wicket:id="cancel" class="btn btn-secondary">Cancel</a>
+ </div>
+ </form>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/IssueCreationSettingEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/servicedesk/IssueCreationSettingEditPanel.java
similarity index 78%
rename from server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/IssueCreationSettingEditPanel.java
rename to server-core/src/main/java/io/onedev/server/web/editable/servicedesk/IssueCreationSettingEditPanel.java
index 54e6dff9f5..9008e3671f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/IssueCreationSettingEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/servicedesk/IssueCreationSettingEditPanel.java
@@ -1,111 +1,111 @@
-package io.onedev.server.web.page.admin.servicedesk;
-
-import java.util.List;
-
-import org.apache.commons.lang3.SerializationUtils;
-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.markup.html.form.Form;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.request.cycle.RequestCycle;
-
-import io.onedev.server.model.support.administration.IssueCreationSetting;
-import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
-import io.onedev.server.web.editable.BeanContext;
-import io.onedev.server.web.editable.BeanEditor;
-
-@SuppressWarnings("serial")
-abstract class IssueCreationSettingEditPanel extends Panel {
-
- private final int settingIndex;
-
- public IssueCreationSettingEditPanel(String id, int settingIndex) {
- super(id);
-
- this.settingIndex = settingIndex;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- IssueCreationSetting setting;
- if (settingIndex != -1)
- setting = SerializationUtils.clone(getIssueCreationSettings().get(settingIndex));
- else
- setting = new IssueCreationSetting();
-
- Form<?> form = new Form<Void>("form") {
-
- @Override
- protected void onError() {
- super.onError();
- RequestCycle.get().find(AjaxRequestTarget.class).add(this);
- }
-
- };
-
- form.add(new AjaxLink<Void>("close") {
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(IssueCreationSettingEditPanel.this));
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- onCancel(target);
- }
-
- });
-
- BeanEditor editor = BeanContext.edit("editor", setting);
- form.add(editor);
- form.add(new AjaxButton("save") {
-
- @Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
- super.onSubmit(target, form);
-
- if (editor.isValid()) {
- if (settingIndex != -1)
- getIssueCreationSettings().set(settingIndex, setting);
- else
- getIssueCreationSettings().add(setting);
- onSave(target);
- } else {
- target.add(form);
- }
- }
-
- });
-
- form.add(new AjaxLink<Void>("cancel") {
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(IssueCreationSettingEditPanel.this));
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- onCancel(target);
- }
-
- });
- form.setOutputMarkupId(true);
-
- add(form);
- }
-
- protected abstract List<IssueCreationSetting> getIssueCreationSettings();
-
- protected abstract void onSave(AjaxRequestTarget target);
-
- protected abstract void onCancel(AjaxRequestTarget target);
-
-}
+package io.onedev.server.web.editable.servicedesk;
+
+import java.util.List;
+
+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.html.form.Form;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.request.cycle.RequestCycle;
+
+import io.onedev.server.model.support.administration.IssueCreationSetting;
+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
+import io.onedev.server.web.editable.BeanContext;
+import io.onedev.server.web.editable.BeanEditor;
+
+@SuppressWarnings("serial")
+abstract class IssueCreationSettingEditPanel extends Panel {
+
+ private final List<IssueCreationSetting> settings;
+
+ private final int settingIndex;
+
+ public IssueCreationSettingEditPanel(String id, List<IssueCreationSetting> settings, int settingIndex) {
+ super(id);
+
+ this.settings = settings;
+ this.settingIndex = settingIndex;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ IssueCreationSetting setting;
+ if (settingIndex != -1)
+ setting = settings.get(settingIndex);
+ else
+ setting = new IssueCreationSetting();
+
+ Form<?> form = new Form<Void>("form") {
+
+ @Override
+ protected void onError() {
+ super.onError();
+ RequestCycle.get().find(AjaxRequestTarget.class).add(this);
+ }
+
+ };
+
+ form.add(new FencedFeedbackPanel("feedback", form));
+
+ form.add(new AjaxLink<Void>("close") {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(IssueCreationSettingEditPanel.this));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onCancel(target);
+ }
+
+ });
+
+ BeanEditor editor = BeanContext.edit("editor", setting);
+ form.add(editor);
+ form.add(new AjaxButton("save") {
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+ super.onSubmit(target, form);
+
+ if (settingIndex != -1)
+ settings.set(settingIndex, setting);
+ else
+ settings.add(setting);
+
+ onSave(target);
+ }
+
+ });
+
+ form.add(new AjaxLink<Void>("cancel") {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(IssueCreationSettingEditPanel.this));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onCancel(target);
+ }
+
+ });
+ form.setOutputMarkupId(true);
+
+ add(form);
+ }
+
+ protected abstract void onSave(AjaxRequestTarget target);
+
+ protected abstract void onCancel(AjaxRequestTarget target);
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/servicedesk/IssueCreationSettingEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/servicedesk/IssueCreationSettingEditSupport.java
new file mode 100644
index 0000000000..86a12d5da0
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/editable/servicedesk/IssueCreationSettingEditSupport.java
@@ -0,0 +1,47 @@
+package io.onedev.server.web.editable.servicedesk;
+
+import java.io.Serializable;
+import java.util.List;
+
+import org.apache.wicket.model.IModel;
+
+import io.onedev.server.model.support.administration.IssueCreationSetting;
+import io.onedev.server.util.ReflectionUtils;
+import io.onedev.server.web.editable.EditSupport;
+import io.onedev.server.web.editable.PropertyContext;
+import io.onedev.server.web.editable.PropertyDescriptor;
+import io.onedev.server.web.editable.PropertyEditor;
+import io.onedev.server.web.editable.PropertyViewer;
+
+@SuppressWarnings("serial")
+public class IssueCreationSettingEditSupport implements EditSupport {
+
+ @Override
+ public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {
+ if (List.class.isAssignableFrom(descriptor.getPropertyClass())) {
+ Class<?> elementClass = ReflectionUtils.getCollectionElementClass(descriptor.getPropertyGetter().getGenericReturnType());
+ if (elementClass == IssueCreationSetting.class) {
+ return new PropertyContext<List<Serializable>>(descriptor) {
+
+ @Override
+ public PropertyViewer renderForView(String componentId, final IModel<List<Serializable>> model) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public PropertyEditor<List<Serializable>> renderForEdit(String componentId, IModel<List<Serializable>> model) {
+ return new IssueCreationSettingListEditPanel(componentId, descriptor, model);
+ }
+
+ };
+ }
+ }
+ return null;
+ }
+
+ @Override
+ public int getPriority() {
+ return 0;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/servicedesk/IssueCreationSettingListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/servicedesk/IssueCreationSettingListEditPanel.html
new file mode 100644
index 0000000000..f2b6e0d8ab
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/editable/servicedesk/IssueCreationSettingListEditPanel.html
@@ -0,0 +1,12 @@
+<wicket:panel>
+ <div class="issue-creation-setting-list">
+ <table wicket:id="settings" class="table-hover"></table>
+ <div class="foot">
+ <a wicket:id="addNew" title="Add new issue creation setting" class="btn btn-light btn-hover-primary btn-block"><wicket:svg href="plus" class="icon"></wicket:svg></a>
+ </div>
+ </div>
+ <wicket:fragment wicket:id="actionColumnFrag">
+ <a wicket:id="edit" class="btn btn-icon btn-xs btn-light btn-hover-primary mr-1" title="Edit"><wicket:svg href="ellipsis" class="icon"></wicket:svg></a>
+ <a wicket:id="delete" class="btn btn-icon btn-xs btn-light btn-hover-danger" title="Delete"><wicket:svg href="trash" class="icon"></wicket:svg></a>
+ </wicket:fragment>
+</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/IssueCreationSettingListPage.java b/server-core/src/main/java/io/onedev/server/web/editable/servicedesk/IssueCreationSettingListEditPanel.java
similarity index 55%
rename from server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/IssueCreationSettingListPage.java
rename to server-core/src/main/java/io/onedev/server/web/editable/servicedesk/IssueCreationSettingListEditPanel.java
index a19b8f2d79..c91ef2a1f4 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/IssueCreationSettingListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/servicedesk/IssueCreationSettingListEditPanel.java
@@ -1,257 +1,230 @@
-package io.onedev.server.web.page.admin.servicedesk;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-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.extensions.markup.html.repeater.data.grid.ICellPopulator;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
-import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.list.LoopItem;
-import org.apache.wicket.markup.html.panel.Fragment;
-import org.apache.wicket.markup.repeater.Item;
-import org.apache.wicket.markup.repeater.data.IDataProvider;
-import org.apache.wicket.markup.repeater.data.ListDataProvider;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.model.support.administration.IssueCreationSetting;
-import io.onedev.server.model.support.administration.ServiceDeskSetting;
-import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
-import io.onedev.server.web.behavior.NoRecordsBehavior;
-import io.onedev.server.web.behavior.sortable.SortBehavior;
-import io.onedev.server.web.behavior.sortable.SortPosition;
-import io.onedev.server.web.component.modal.ModalLink;
-import io.onedev.server.web.component.modal.ModalPanel;
-import io.onedev.server.web.component.svg.SpriteImage;
-import io.onedev.server.web.page.admin.AdministrationPage;
-
-@SuppressWarnings("serial")
-public class IssueCreationSettingListPage extends AdministrationPage {
-
- private final List<IssueCreationSetting> issueCreationSettings;
-
- public IssueCreationSettingListPage(PageParameters params) {
- super(params);
- issueCreationSettings = getSettingManager().getServiceDeskSetting().getIssueCreationSettings();
- }
-
- private DataTable<IssueCreationSetting, Void> issueCreationSettingsTable;
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- add(new ModalLink("addNew") {
-
- @Override
- protected Component newContent(String id, ModalPanel modal) {
- return new IssueCreationSettingEditPanel(id, -1) {
-
- @Override
- protected void onSave(AjaxRequestTarget target) {
- saveIssueCreationSettings();
- target.add(issueCreationSettingsTable);
- modal.close();
- }
-
- @Override
- protected void onCancel(AjaxRequestTarget target) {
- modal.close();
- }
-
- @Override
- protected List<IssueCreationSetting> getIssueCreationSettings() {
- return issueCreationSettings;
- }
-
- };
- }
-
- @Override
- protected String getModalCssClass() {
- return "modal-lg";
- }
-
- });
-
- List<IColumn<IssueCreationSetting, Void>> columns = new ArrayList<>();
-
- columns.add(new AbstractColumn<IssueCreationSetting, Void>(Model.of("")) {
-
- @Override
- public void populateItem(Item<ICellPopulator<IssueCreationSetting>> cellItem, String componentId, IModel<IssueCreationSetting> rowModel) {
- cellItem.add(new SpriteImage(componentId, "grip") {
-
- @Override
- protected void onComponentTag(ComponentTag tag) {
- super.onComponentTag(tag);
- tag.setName("svg");
- tag.put("class", "icon drag-indicator");
- }
-
- });
- }
-
- @Override
- public String getCssClass() {
- return "minimum actions";
- }
-
- });
-
- columns.add(new AbstractColumn<IssueCreationSetting, Void>(Model.of("Applicable Senders")) {
-
- @Override
- public void populateItem(Item<ICellPopulator<IssueCreationSetting>> cellItem, String componentId, IModel<IssueCreationSetting> rowModel) {
- IssueCreationSetting issueCreationSetting = rowModel.getObject();
- if (issueCreationSetting.getSenderEmails() != null)
- cellItem.add(new Label(componentId, issueCreationSetting.getSenderEmails()));
- else
- cellItem.add(new Label(componentId, "<i>Any sender</i>").setEscapeModelStrings(false));
- }
-
- });
-
- columns.add(new AbstractColumn<IssueCreationSetting, Void>(Model.of("Applicable Projects")) {
-
- @Override
- public void populateItem(Item<ICellPopulator<IssueCreationSetting>> cellItem, String componentId, IModel<IssueCreationSetting> rowModel) {
- IssueCreationSetting issueCreationSetting = rowModel.getObject();
- if (issueCreationSetting.getApplicableProjects() != null)
- cellItem.add(new Label(componentId, issueCreationSetting.getApplicableProjects()));
- else
- cellItem.add(new Label(componentId, "<i>Any project</i>").setEscapeModelStrings(false));
- }
-
- });
-
- columns.add(new AbstractColumn<IssueCreationSetting, Void>(Model.of("")) {
-
- @Override
- public void populateItem(Item<ICellPopulator<IssueCreationSetting>> cellItem, String componentId, IModel<IssueCreationSetting> rowModel) {
- int issueCreationSettingIndex = cellItem.findParent(LoopItem.class).getIndex();
-
- Fragment fragment = new Fragment(componentId, "actionColumnFrag", IssueCreationSettingListPage.this);
- fragment.add(new ModalLink("edit") {
-
- @Override
- protected Component newContent(String id, ModalPanel modal) {
- return new IssueCreationSettingEditPanel(id, issueCreationSettingIndex) {
-
- @Override
- protected void onSave(AjaxRequestTarget target) {
- saveIssueCreationSettings();
- target.add(issueCreationSettingsTable);
- modal.close();
- }
-
- @Override
- protected void onCancel(AjaxRequestTarget target) {
- modal.close();
- }
-
- @Override
- protected List<IssueCreationSetting> getIssueCreationSettings() {
- return issueCreationSettings;
- }
-
- };
- }
-
- @Override
- protected String getModalCssClass() {
- return "modal-lg";
- }
-
- });
- fragment.add(new AjaxLink<Void>("delete") {
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to delete this entry?"));
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- issueCreationSettings.remove(issueCreationSettingIndex);
- saveIssueCreationSettings();
- target.add(issueCreationSettingsTable);
- }
-
- });
-
- cellItem.add(fragment);
- }
-
- @Override
- public String getCssClass() {
- return "actions";
- }
-
- });
-
- IDataProvider<IssueCreationSetting> dataProvider = new ListDataProvider<IssueCreationSetting>() {
-
- @Override
- protected List<IssueCreationSetting> getData() {
- return issueCreationSettings;
- }
-
- };
-
- add(issueCreationSettingsTable = new DataTable<IssueCreationSetting, Void>("issueCreationSettings", columns, dataProvider, Integer.MAX_VALUE));
- issueCreationSettingsTable.addTopToolbar(new HeadersToolbar<Void>(issueCreationSettingsTable, null));
- issueCreationSettingsTable.addBottomToolbar(new NoRecordsToolbar(issueCreationSettingsTable));
- issueCreationSettingsTable.add(new NoRecordsBehavior());
- issueCreationSettingsTable.setOutputMarkupId(true);
-
- issueCreationSettingsTable.add(new SortBehavior() {
-
- @Override
- protected void onSort(AjaxRequestTarget target, SortPosition from, SortPosition to) {
- int fromIndex = from.getItemIndex();
- int toIndex = to.getItemIndex();
- if (fromIndex < toIndex) {
- for (int i=0; i<toIndex-fromIndex; i++)
- Collections.swap(issueCreationSettings, fromIndex+i, fromIndex+i+1);
- } else {
- for (int i=0; i<fromIndex-toIndex; i++)
- Collections.swap(issueCreationSettings, fromIndex-i, fromIndex-i-1);
- }
- saveIssueCreationSettings();
- target.add(issueCreationSettingsTable);
- }
-
- }.sortable("tbody"));
- }
-
- @Override
- protected Component newTopbarTitle(String componentId) {
- return new Label(componentId, "Issue Creation Settings");
- }
-
- private SettingManager getSettingManager() {
- return OneDev.getInstance(SettingManager.class);
- }
-
- private void saveIssueCreationSettings() {
- ServiceDeskSetting setting = getSettingManager().getServiceDeskSetting();
- setting.setIssueCreationSettings(issueCreationSettings);
- getSettingManager().saveServiceDeskSetting(setting);
- }
-
-}
+package io.onedev.server.web.editable.servicedesk;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.event.IEvent;
+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.markup.repeater.Item;
+import org.apache.wicket.markup.repeater.data.IDataProvider;
+import org.apache.wicket.markup.repeater.data.ListDataProvider;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.util.convert.ConversionException;
+
+import io.onedev.server.model.support.administration.IssueCreationSetting;
+import io.onedev.server.web.behavior.NoRecordsBehavior;
+import io.onedev.server.web.behavior.sortable.SortBehavior;
+import io.onedev.server.web.behavior.sortable.SortPosition;
+import io.onedev.server.web.component.modal.ModalLink;
+import io.onedev.server.web.component.modal.ModalPanel;
+import io.onedev.server.web.component.svg.SpriteImage;
+import io.onedev.server.web.editable.PropertyDescriptor;
+import io.onedev.server.web.editable.PropertyEditor;
+import io.onedev.server.web.editable.PropertyUpdating;
+
+@SuppressWarnings("serial")
+class IssueCreationSettingListEditPanel extends PropertyEditor<List<Serializable>> {
+
+ private final List<IssueCreationSetting> settings;
+
+ public IssueCreationSettingListEditPanel(String id, PropertyDescriptor propertyDescriptor, IModel<List<Serializable>> model) {
+ super(id, propertyDescriptor, model);
+
+ settings = new ArrayList<>();
+ for (Serializable each: model.getObject()) {
+ settings.add((IssueCreationSetting) each);
+ }
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new ModalLink("addNew") {
+
+ @Override
+ protected Component newContent(String id, ModalPanel modal) {
+ return new IssueCreationSettingEditPanel(id, settings, -1) {
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ modal.close();
+ }
+
+ @Override
+ protected void onSave(AjaxRequestTarget target) {
+ markFormDirty(target);
+ modal.close();
+ onPropertyUpdating(target);
+ target.add(IssueCreationSettingListEditPanel.this);
+ }
+
+ };
+ }
+
+ });
+
+ List<IColumn<IssueCreationSetting, Void>> columns = new ArrayList<>();
+
+ columns.add(new AbstractColumn<IssueCreationSetting, Void>(Model.of("")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<IssueCreationSetting>> cellItem, String componentId, IModel<IssueCreationSetting> rowModel) {
+ cellItem.add(new SpriteImage(componentId, "grip") {
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ tag.setName("svg");
+ tag.put("class", "icon drag-indicator");
+ }
+
+ });
+ }
+
+ @Override
+ public String getCssClass() {
+ return "minimum actions";
+ }
+
+ });
+
+ columns.add(new AbstractColumn<IssueCreationSetting, Void>(Model.of("Sender Emails")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<IssueCreationSetting>> cellItem, String componentId, IModel<IssueCreationSetting> rowModel) {
+ IssueCreationSetting setting = rowModel.getObject();
+ if (setting.getSenderEmails() != null)
+ cellItem.add(new Label(componentId, setting.getSenderEmails()));
+ else
+ cellItem.add(new Label(componentId, "<i>Any sender</i>").setEscapeModelStrings(false));
+ }
+ });
+
+ columns.add(new AbstractColumn<IssueCreationSetting, Void>(Model.of("Applicable Projects")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<IssueCreationSetting>> cellItem, String componentId, IModel<IssueCreationSetting> rowModel) {
+ IssueCreationSetting setting = rowModel.getObject();
+ if (setting.getApplicableProjects() != null)
+ cellItem.add(new Label(componentId, setting.getApplicableProjects()));
+ else
+ cellItem.add(new Label(componentId, "<i>Any project</i>").setEscapeModelStrings(false));
+ }
+ });
+
+ columns.add(new AbstractColumn<IssueCreationSetting, Void>(Model.of("")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<IssueCreationSetting>> cellItem, String componentId, IModel<IssueCreationSetting> rowModel) {
+ Fragment fragment = new Fragment(componentId, "actionColumnFrag", IssueCreationSettingListEditPanel.this);
+ fragment.add(new ModalLink("edit") {
+
+ @Override
+ protected Component newContent(String id, ModalPanel modal) {
+ return new IssueCreationSettingEditPanel(id, settings, cellItem.findParent(Item.class).getIndex()) {
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ modal.close();
+ }
+
+ @Override
+ protected void onSave(AjaxRequestTarget target) {
+ markFormDirty(target);
+ modal.close();
+ onPropertyUpdating(target);
+ target.add(IssueCreationSettingListEditPanel.this);
+ }
+
+ };
+ }
+
+ });
+ fragment.add(new AjaxLink<Void>("delete") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ markFormDirty(target);
+ settings.remove(rowModel.getObject());
+ onPropertyUpdating(target);
+ target.add(IssueCreationSettingListEditPanel.this);
+ }
+
+ });
+ cellItem.add(fragment);
+ }
+
+ @Override
+ public String getCssClass() {
+ return "actions minimum";
+ }
+
+ });
+
+ IDataProvider<IssueCreationSetting> dataProvider = new ListDataProvider<IssueCreationSetting>() {
+
+ @Override
+ protected List<IssueCreationSetting> getData() {
+ return settings;
+ }
+
+ };
+
+ DataTable<IssueCreationSetting, Void> dataTable;
+ add(dataTable = new DataTable<IssueCreationSetting, Void>("settings", columns, dataProvider, Integer.MAX_VALUE));
+ dataTable.addTopToolbar(new HeadersToolbar<Void>(dataTable, null));
+ dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable, Model.of("Not defined")));
+ dataTable.add(new NoRecordsBehavior());
+ dataTable.add(new SortBehavior() {
+
+ @Override
+ protected void onSort(AjaxRequestTarget target, SortPosition from, SortPosition to) {
+ int fromIndex = from.getItemIndex();
+ int toIndex = to.getItemIndex();
+ if (fromIndex < toIndex) {
+ for (int i=0; i<toIndex-fromIndex; i++)
+ Collections.swap(settings, fromIndex+i, fromIndex+i+1);
+ } else {
+ for (int i=0; i<fromIndex-toIndex; i++)
+ Collections.swap(settings, fromIndex-i, fromIndex-i-1);
+ }
+ onPropertyUpdating(target);
+ target.add(IssueCreationSettingListEditPanel.this);
+ }
+
+ }.sortable("tbody"));
+ }
+
+ @Override
+ public void onEvent(IEvent<?> event) {
+ super.onEvent(event);
+
+ if (event.getPayload() instanceof PropertyUpdating) {
+ event.stop();
+ onPropertyUpdating(((PropertyUpdating)event.getPayload()).getHandler());
+ }
+ }
+
+ @Override
+ protected List<Serializable> convertInputToValue() throws ConversionException {
+ List<Serializable> value = new ArrayList<>();
+ for (IssueCreationSetting each: settings)
+ value.add(each);
+ return value;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/string/StringPropertyViewer.java b/server-core/src/main/java/io/onedev/server/web/editable/string/StringPropertyViewer.java
index 1b5e943359..1aa2ce6a7d 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/string/StringPropertyViewer.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/string/StringPropertyViewer.java
@@ -3,7 +3,7 @@ package io.onedev.server.web.editable.string;
import org.apache.wicket.Component;
import org.apache.wicket.markup.html.basic.Label;
-import io.onedev.commons.utils.HtmlUtils;
+import io.onedev.server.util.HtmlUtils;
import io.onedev.server.web.editable.EmptyValueLabel;
import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.PropertyViewer;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.java
index feeca0f402..656e05fd77 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.java
@@ -126,8 +126,8 @@ public class MailSettingPage extends AdministrationPage {
+ MailManager.TEST_SUB_ADDRESSING + "@" + emailAddress.getDomain();
logger.log("Sending test mail to " + subAddressed + "...");
mailManager.sendMail(mailSetting,
- Sets.newHashSet(subAddressed), Lists.newArrayList(), uuid,
- "This is a test email from OneDev", "This is a test email from OneDev", null, null);
+ Sets.newHashSet(subAddressed), Lists.newArrayList(), Lists.newArrayList(), uuid,
+ "[Test] Test Email From OneDev", "This is a test email from OneDev", null, null);
logger.log("Waiting for test mail to come back...");
@@ -142,8 +142,8 @@ public class MailSettingPage extends AdministrationPage {
return "Great, your mail setting is working";
} else {
String body = "Great, your mail setting is working!";
- mailManager.sendMail(mailSettingHolder.getMailSetting(),
- Sets.newHashSet(user.getEmail()), Lists.newArrayList(), "Test email from OneDev",
+ mailManager.sendMail(mailSettingHolder.getMailSetting(), Sets.newHashSet(user.getEmail()),
+ Lists.newArrayList(), Lists.newArrayList(), "[Test] Test Email From OneDev",
body, body, null, null);
return "Test mail has been sent to " + user.getEmail() + ", please check your mail box";
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/DefaultProjectDesignationListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/DefaultProjectDesignationListPage.html
deleted file mode 100644
index d7685fa22f..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/DefaultProjectDesignationListPage.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<wicket:extend>
- <div class="card">
- <div class="card-body">
- <div class="alert alert-light alert-notice mb-5">The service desk feature enables user to create issues via
- email directly. If such email is sent to system email address directly without specifying project, OneDev
- will use default projects defined here to decide where to create issues. For a particular sender, the first
- matching entry will take effect</div>
- <form wicket:id="form" class="default-project-designations leave-confirm">
- <div wicket:id="editor"></div>
- <input type="submit" class="btn btn-primary dirty-aware mt-4" value="Save">
- </form>
- </div>
- </div>
-</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/DefaultProjectDesignationListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/DefaultProjectDesignationListPage.java
deleted file mode 100644
index 99d0833858..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/DefaultProjectDesignationListPage.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package io.onedev.server.web.page.admin.servicedesk;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.markup.html.basic.Label;
-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.ServiceDeskSetting;
-import io.onedev.server.web.editable.BeanContext;
-import io.onedev.server.web.page.admin.AdministrationPage;
-
-@SuppressWarnings("serial")
-public class DefaultProjectDesignationListPage extends AdministrationPage {
-
- public DefaultProjectDesignationListPage(PageParameters params) {
- super(params);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- ServiceDeskSetting setting = getSettingManager().getServiceDeskSetting();
-
- Form<?> form = new Form<Void>("form") {
-
- @Override
- protected void onSubmit() {
- super.onSubmit();
- getSettingManager().saveServiceDeskSetting(setting);
- }
-
- };
-
- form.add(BeanContext.edit("editor", setting,
- Lists.newArrayList(ServiceDeskSetting.PROP_DEFAULT_PROJECT_DESIGNATIONS), false));
- add(form);
- }
-
- @Override
- protected Component newTopbarTitle(String componentId) {
- return new Label(componentId, "Default Projects");
- }
-
- private SettingManager getSettingManager() {
- return OneDev.getInstance(SettingManager.class);
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/IssueCreationSettingListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/IssueCreationSettingListPage.html
deleted file mode 100644
index c35ec960fe..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/IssueCreationSettingListPage.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<wicket:extend>
- <div class="card">
- <div class="card-body">
- <div class="alert alert-light alert-notice mb-5">The service desk feature enables user to create issues via
- email directly. Upon receiving such email, OneDev will use issue creation settings defined here to decide
- how to create the issue. For a particular sender and project, the first matching entry will take effect</div>
- <a wicket:id="addNew" class="btn btn-icon btn-primary mb-4" title="Add issue creation setting"><wicket:svg href="plus" class="icon"></wicket:svg></a>
- <table wicket:id="issueCreationSettings" class="table table-hover"></table>
- </div>
- </div>
- <wicket:fragment wicket:id="actionColumnFrag">
- <a wicket:id="edit" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-1" title="More"><wicket:svg href="ellipsis" class="icon"></wicket:svg></a>
- <a wicket:id="delete" class="btn btn-xs btn-icon btn-light btn-hover-danger" title="Delete"><wicket:svg href="trash" class="icon"></wicket:svg></a>
- </wicket:fragment>
-</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/SenderAuthorizationListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/SenderAuthorizationListPage.html
deleted file mode 100644
index a82fd1ccf3..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/SenderAuthorizationListPage.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<wicket:extend>
- <div class="card">
- <div class="card-body">
- <div class="alert alert-light alert-notice mb-5">The service desk feature enables user to create issues, post
- issue or pull request comments via email directly. When sender email address can not be mapped to an existing
- user, OneDev will use sender authorizations defined here to determine if the sender has permission to execute
- relevant actions. For a particular sender, the first matching entry will take effect</div>
-
- <form wicket:id="form" class="sender-authorizations leave-confirm">
- <div wicket:id="editor"></div>
- <input type="submit" class="btn btn-primary dirty-aware mt-4" value="Save">
- </form>
- </div>
- </div>
-</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/SenderAuthorizationListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/SenderAuthorizationListPage.java
deleted file mode 100644
index c7f9173bff..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/SenderAuthorizationListPage.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package io.onedev.server.web.page.admin.servicedesk;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.markup.html.basic.Label;
-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.ServiceDeskSetting;
-import io.onedev.server.web.editable.BeanContext;
-import io.onedev.server.web.page.admin.AdministrationPage;
-
-@SuppressWarnings("serial")
-public class SenderAuthorizationListPage extends AdministrationPage {
-
- public SenderAuthorizationListPage(PageParameters params) {
- super(params);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- ServiceDeskSetting setting = getSettingManager().getServiceDeskSetting();
-
- Form<?> form = new Form<Void>("form") {
-
- @Override
- protected void onSubmit() {
- super.onSubmit();
- getSettingManager().saveServiceDeskSetting(setting);
- }
-
- };
-
- form.add(BeanContext.edit("editor", setting,
- Lists.newArrayList(ServiceDeskSetting.PROP_SENDER_AUTHORIZATIONS), false));
- add(form);
- }
-
- @Override
- protected Component newTopbarTitle(String componentId) {
- return new Label(componentId, "Sender Authorizations");
- }
-
- private SettingManager getSettingManager() {
- return OneDev.getInstance(SettingManager.class);
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/ServiceDeskSettingHolder.java b/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/ServiceDeskSettingHolder.java
new file mode 100644
index 0000000000..e286f1c4e9
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/ServiceDeskSettingHolder.java
@@ -0,0 +1,24 @@
+package io.onedev.server.web.page.admin.servicedesk;
+
+import java.io.Serializable;
+
+import io.onedev.server.model.support.administration.ServiceDeskSetting;
+import io.onedev.server.web.editable.annotation.Editable;
+
+@Editable
+public class ServiceDeskSettingHolder implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private ServiceDeskSetting serviceDeskSetting;
+
+ @Editable(name="Enable")
+ public ServiceDeskSetting getServiceDeskSetting() {
+ return serviceDeskSetting;
+ }
+
+ public void setServiceDeskSetting(ServiceDeskSetting serviceDeskSetting) {
+ this.serviceDeskSetting = serviceDeskSetting;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/ServiceDeskSettingPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/ServiceDeskSettingPage.html
new file mode 100644
index 0000000000..0da8ba5506
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/ServiceDeskSettingPage.html
@@ -0,0 +1,23 @@
+<wicket:extend>
+ <div class="card service-desk-setting">
+ <div class="card-body">
+ <div class="alert alert-light alert-notice">
+ <p>The service desk feature enables user to create issues by sending emails to OneDev. Issues can be discussed over
+ email completely, without the need of logging to OneDev.
+ <p>System email address defined in mail setting should be
+ used as recipient of such email, and project name may be appended to this address using to indicate where to create issues.
+ For instance, if system email address
+ is specified as <tt>[email protected]</tt>, sending email to <tt>[email protected]</tt> will create
+ issue in <tt>myproject</tt>. If project name is not appended, OneDev will look up the project using
+ project designation information below
+ <p class="text-info mb-0"> <b>NOTE: </b> Service desk only takes effect if <a wicket:id="mailSetting">mail setting</a> is defined and its
+ <tt>check incoming email</tt> option is enabled. Also <a href='https://en.wikipedia.org/wiki/Email_address#Subaddressing' target='_blank'>sub addressing</a>
+ needs to be enabled for the system email address
+ </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 Setting">
+ </form>
+ </div>
+ </div>
+</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/ServiceDeskSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/ServiceDeskSettingPage.java
new file mode 100644
index 0000000000..716ac42385
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/servicedesk/ServiceDeskSettingPage.java
@@ -0,0 +1,60 @@
+package io.onedev.server.web.page.admin.servicedesk;
+
+import org.apache.wicket.Component;
+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.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.web.editable.BeanContext;
+import io.onedev.server.web.editable.BeanEditor;
+import io.onedev.server.web.page.admin.AdministrationPage;
+import io.onedev.server.web.page.admin.mailsetting.MailSettingPage;
+
+@SuppressWarnings("serial")
+public class ServiceDeskSettingPage extends AdministrationPage {
+
+ public ServiceDeskSettingPage(PageParameters params) {
+ super(params);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(new BookmarkablePageLink<Void>("mailSetting", MailSettingPage.class));
+
+ ServiceDeskSettingHolder serviceDeskSettingHolder = new ServiceDeskSettingHolder();
+ serviceDeskSettingHolder.setServiceDeskSetting(OneDev.getInstance(SettingManager.class).getServiceDeskSetting());
+
+ BeanEditor editor = BeanContext.edit("editor", serviceDeskSettingHolder);
+
+ Button saveButton = new Button("save") {
+
+ @Override
+ public void onSubmit() {
+ super.onSubmit();
+
+ OneDev.getInstance(SettingManager.class).saveServiceDeskSetting(serviceDeskSettingHolder.getServiceDeskSetting());
+ getSession().success("Service desk setting has been saved");
+ }
+
+ };
+
+ Form<?> form = new Form<Void>("form");
+
+ form.add(editor);
+ form.add(saveButton);
+
+ add(form);
+ }
+
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ return new Label(componentId, "Service Desk Setting");
+ }
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java
index 7f24cc3ad6..e38b28c94b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/base/BasePage.java
@@ -30,6 +30,7 @@ import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.FeedbackPanel;
import org.apache.wicket.markup.repeater.RepeatingView;
+import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.protocol.ws.api.WebSocketBehavior;
import org.apache.wicket.protocol.ws.api.WebSocketRequestHandler;
import org.apache.wicket.protocol.ws.api.message.TextMessage;
@@ -51,8 +52,11 @@ import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.CryptoUtils;
import io.onedev.server.web.asset.icon.IconScope;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
+import io.onedev.server.web.behavior.ForceOrdinaryStyleBehavior;
import io.onedev.server.web.behavior.WebSocketObserver;
import io.onedev.server.web.component.svg.SpriteImage;
+import io.onedev.server.web.editable.BeanEditor;
+import io.onedev.server.web.page.simple.SimplePage;
import io.onedev.server.web.page.simple.security.LoginPage;
import io.onedev.server.web.page.simple.serverinit.ServerInitPage;
import io.onedev.server.web.websocket.WebSocketManager;
@@ -141,15 +145,34 @@ public abstract class BasePage extends WebPage {
});
- StringBuilder builder = new StringBuilder();
- Class<?> clazz = getClass();
- while (clazz != BasePage.class) {
- builder.append(clazz.getSimpleName()).append(" ");
- clazz = clazz.getSuperclass();
- }
-
- String script = String.format("$('html').addClass('%s');", builder.toString());
- add(new Label("script", script).setEscapeModelStrings(false));
+ add(new Label("script", new LoadableDetachableModel<String>() {
+
+ @Override
+ protected String load() {
+ StringBuilder builder = new StringBuilder();
+ Class<?> clazz = getPage().getClass();
+ while (clazz != BasePage.class) {
+ builder.append(clazz.getSimpleName()).append(" ");
+ clazz = clazz.getSuperclass();
+ }
+
+ IVisitor<BeanEditor, BeanEditor> visitor = new IVisitor<BeanEditor, BeanEditor>() {
+
+ @Override
+ public void component(BeanEditor object, IVisit<BeanEditor> visit) {
+ if (!object.getBehaviors(ForceOrdinaryStyleBehavior.class).isEmpty())
+ visit.stop(object);
+ }
+
+ };
+
+ if (getPage() instanceof SimplePage && getPage().visitChildren(BeanEditor.class, visitor) != null)
+ builder.append("force-ordinary-style ");
+
+ return String.format("$('html').addClass('%s');", builder.toString());
+ }
+
+ }).setEscapeModelStrings(false));
sessionFeedback = new SessionFeedbackPanel("sessionFeedback");
add(sessionFeedback);
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 b74cdf7e20..85f93bbff3 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
@@ -66,9 +66,7 @@ import io.onedev.server.web.page.admin.role.RoleDetailPage;
import io.onedev.server.web.page.admin.role.RoleListPage;
import io.onedev.server.web.page.admin.serverinformation.ServerInformationPage;
import io.onedev.server.web.page.admin.serverlog.ServerLogPage;
-import io.onedev.server.web.page.admin.servicedesk.DefaultProjectDesignationListPage;
-import io.onedev.server.web.page.admin.servicedesk.IssueCreationSettingListPage;
-import io.onedev.server.web.page.admin.servicedesk.SenderAuthorizationListPage;
+import io.onedev.server.web.page.admin.servicedesk.ServiceDeskSettingPage;
import io.onedev.server.web.page.admin.ssh.SshSettingPage;
import io.onedev.server.web.page.admin.sso.SsoConnectorListPage;
import io.onedev.server.web.page.admin.systemsetting.SystemSettingPage;
@@ -156,16 +154,8 @@ public abstract class LayoutPage extends BasePage {
administrationMenuItems.add(new SidebarMenuItem.Page(null, "Mail Setting",
MailSettingPage.class, new PageParameters()));
- List<SidebarMenuItem> serviceDeskSettingMenuItems = new ArrayList<>();
- serviceDeskSettingMenuItems.add(new SidebarMenuItem.Page(null, "Sender Authorizations",
- SenderAuthorizationListPage.class, new PageParameters()));
- serviceDeskSettingMenuItems.add(new SidebarMenuItem.Page(null, "Default Projects",
- DefaultProjectDesignationListPage.class, new PageParameters()));
- serviceDeskSettingMenuItems.add(new SidebarMenuItem.Page(null, "Issue Creation Settings",
- IssueCreationSettingListPage.class, new PageParameters()));
-
- administrationMenuItems.add(new SidebarMenuItem.SubMenu(null, "Service Desk Settings",
- serviceDeskSettingMenuItems));
+ administrationMenuItems.add(new SidebarMenuItem.Page(null, "Service Desk Setting",
+ ServiceDeskSettingPage.class, new PageParameters()));
List<SidebarMenuItem> notificationTemplateSettingMenuItems = new ArrayList<>();
notificationTemplateSettingMenuItems.add(new SidebarMenuItem.Page(null, "Issue",
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java
index a92445d6e0..3cfbe09157 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java
@@ -21,6 +21,7 @@ import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.entitymanager.PullRequestManager;
import io.onedev.server.entitymanager.UserManager;
+import io.onedev.server.markdown.MarkdownManager;
import io.onedev.server.model.Build;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
@@ -28,7 +29,6 @@ import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.ContentDetector;
-import io.onedev.server.util.markdown.MarkdownManager;
import io.onedev.server.util.match.MatchScoreProvider;
import io.onedev.server.util.match.MatchScoreUtils;
import io.onedev.server.web.component.markdown.AtWhoReferenceSupport;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
index 6d6e430296..86e819de22 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java
@@ -59,6 +59,7 @@ import io.onedev.server.entitymanager.PullRequestChangeManager;
import io.onedev.server.entitymanager.PullRequestManager;
import io.onedev.server.entitymanager.PullRequestReviewManager;
import io.onedev.server.entitymanager.PullRequestWatchManager;
+import io.onedev.server.entityreference.Referenceable;
import io.onedev.server.infomanager.UserInfoManager;
import io.onedev.server.model.AbstractEntity;
import io.onedev.server.model.Build;
@@ -76,7 +77,6 @@ import io.onedev.server.search.entity.pullrequest.PullRequestQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
import io.onedev.server.util.ProjectScopedNumber;
-import io.onedev.server.util.Referenceable;
import io.onedev.server.web.WebSession;
import io.onedev.server.web.behavior.ReferenceInputBehavior;
import io.onedev.server.web.behavior.WebSocketObserver;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java
index 95996aedb0..52e5a6e488 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java
@@ -41,23 +41,15 @@ import com.google.common.collect.Sets;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.BuildManager;
-import io.onedev.server.entitymanager.CodeCommentManager;
-import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.entitymanager.PullRequestCommentManager;
-import io.onedev.server.entitymanager.PullRequestManager;
import io.onedev.server.entitymanager.UserManager;
-import io.onedev.server.model.CodeComment;
-import io.onedev.server.model.Issue;
+import io.onedev.server.entityreference.ReferencedFromAware;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestChange;
import io.onedev.server.model.PullRequestComment;
import io.onedev.server.model.PullRequestUpdate;
import io.onedev.server.model.User;
-import io.onedev.server.model.support.pullrequest.changedata.PullRequestDescriptionChangeData;
-import io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromCodeCommentData;
-import io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromIssueData;
-import io.onedev.server.model.support.pullrequest.changedata.PullRequestReferencedFromPullRequestData;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
import io.onedev.server.web.behavior.WebSocketObserver;
@@ -160,23 +152,9 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {
}
if (showChangeHistory) {
- for (PullRequestChange change: request.getChanges()) {
- if (change.getData() instanceof PullRequestReferencedFromIssueData) {
- PullRequestReferencedFromIssueData referencedFromIssueData = (PullRequestReferencedFromIssueData) change.getData();
- Issue issue = OneDev.getInstance(IssueManager.class).get(referencedFromIssueData.getIssueId());
- if (issue != null)
- otherActivities.add(new PullRequestChangeActivity(change));
- } else if (change.getData() instanceof PullRequestReferencedFromPullRequestData) {
- PullRequestReferencedFromPullRequestData referencedFromPullRequestData = (PullRequestReferencedFromPullRequestData) change.getData();
- PullRequest otherRequest = OneDev.getInstance(PullRequestManager.class).get(referencedFromPullRequestData.getRequestId());
- if (otherRequest != null)
- otherActivities.add(new PullRequestChangeActivity(change));
- } else if (change.getData() instanceof PullRequestReferencedFromCodeCommentData) {
- PullRequestReferencedFromCodeCommentData referencedFromCodeCommentData = (PullRequestReferencedFromCodeCommentData) change.getData();
- CodeComment comment = OneDev.getInstance(CodeCommentManager.class).get(referencedFromCodeCommentData.getCommentId());
- if (comment != null)
- otherActivities.add(new PullRequestChangeActivity(change));
- } else if (!(change.getData() instanceof PullRequestDescriptionChangeData)) {
+ for (PullRequestChange change: getPullRequest().getChanges()) {
+ if (!(change.getData() instanceof ReferencedFromAware)
+ || ((ReferencedFromAware<?>)change.getData()).getReferencedFrom() != null) {
otherActivities.add(new PullRequestChangeActivity(change));
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.html
index fd30495a56..0a6b52370f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.html
@@ -3,5 +3,8 @@
<span wicket:id="user" class="user"></span> <span wicket:id="description"></span> <span wicket:id="age"></span>
<a wicket:id="changes" class="changes btn btn-icon btn-xs btn-light btn-hover-primary" title="Changes since this action"><wicket:svg href="diff" class="icon"></wicket:svg></a>
</div>
- <div wicket:id="body" class="body"></div>
+ <div class="body">
+ <div wicket:id="detail" class="detail"></div>
+ <div wicket:id="comment" class="comment"></div>
+ </div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.java
index 060db8372c..4c6589afa1 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.java
@@ -1,6 +1,8 @@
package io.onedev.server.web.page.project.pullrequests.detail.activities.activity;
-import org.apache.wicket.Component;
+import java.util.List;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
@@ -8,10 +10,21 @@ import org.apache.wicket.markup.html.panel.GenericPanel;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.UserManager;
+import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestChange;
+import io.onedev.server.model.User;
+import io.onedev.server.notification.ActivityDetail;
+import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
+import io.onedev.server.web.component.markdown.AttachmentSupport;
+import io.onedev.server.web.component.markdown.ContentVersionSupport;
+import io.onedev.server.web.component.project.comment.ProjectCommentPanel;
import io.onedev.server.web.page.project.pullrequests.detail.activities.SinceChangesLink;
+import io.onedev.server.web.util.DeleteCallback;
+import io.onedev.server.web.util.ProjectAttachmentSupport;
@SuppressWarnings("serial")
class PullRequestChangePanel extends GenericPanel<PullRequestChange> {
@@ -43,13 +56,66 @@ class PullRequestChangePanel extends GenericPanel<PullRequestChange> {
}, getChange().getDate()));
- Component body = change.getData().render("body", change);
- if (body != null) {
- add(body);
+ ActivityDetail detail = getChange().getData().getActivityDetail();
+ if (detail != null)
+ add(detail.render("detail"));
+ else
+ add(new WebMarkupContainer("detail").setVisible(false));
+
+ if (getChange().getData().getCommentAware() != null) {
+ add(new ProjectCommentPanel("comment") {
+
+ @Override
+ protected String getComment() {
+ return getChange().getData().getCommentAware().getComment();
+ }
+
+ @Override
+ protected List<User> getMentionables() {
+ return OneDev.getInstance(UserManager.class).queryAndSort(getChange().getRequest().getParticipants());
+ }
+
+ @Override
+ protected void onSaveComment(AjaxRequestTarget target, String comment) {
+ getChange().getData().getCommentAware().setComment(comment);
+ }
+
+ @Override
+ protected Project getProject() {
+ return getChange().getRequest().getProject();
+ }
+
+ @Override
+ protected AttachmentSupport getAttachmentSupport() {
+ return new ProjectAttachmentSupport(getProject(), getChange().getRequest().getUUID(),
+ SecurityUtils.canManagePullRequests(getProject()));
+ }
+
+ @Override
+ protected boolean canModifyOrDeleteComment() {
+ return SecurityUtils.canModifyOrDelete(getChange());
+ }
+
+ @Override
+ protected String getRequiredLabel() {
+ return null;
+ }
+
+ @Override
+ protected ContentVersionSupport getContentVersionSupport() {
+ return null;
+ }
+
+ @Override
+ protected DeleteCallback getDeleteCallback() {
+ return null;
+ }
+
+ });
} else {
- add(new WebMarkupContainer("body").setVisible(false));
- add(AttributeAppender.append("class", "no-body"));
+ add(new WebMarkupContainer("comment").setVisible(false));
}
+
}
private PullRequestChange getChange() {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedPanel.java
index 11cfb851da..54dbfe7f29 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestOpenedPanel.java
@@ -9,7 +9,7 @@ import org.apache.wicket.markup.html.panel.GenericPanel;
import org.apache.wicket.model.IModel;
import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.PullRequestChangeManager;
+import io.onedev.server.entitymanager.PullRequestManager;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
@@ -47,7 +47,7 @@ class PullRequestOpenedPanel extends GenericPanel<PullRequest> {
@Override
protected void onSaveComment(AjaxRequestTarget target, String comment) {
- OneDev.getInstance(PullRequestChangeManager.class).changeDescription(getPullRequest(), comment);
+ OneDev.getInstance(PullRequestManager.class).saveDescription(getPullRequest(), comment);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/error/InUseErrorPage.java b/server-core/src/main/java/io/onedev/server/web/page/simple/error/InUseErrorPage.java
index e48ee56d79..75a33b72b3 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/simple/error/InUseErrorPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/error/InUseErrorPage.java
@@ -6,7 +6,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import io.onedev.commons.utils.HtmlUtils;
+import io.onedev.server.util.HtmlUtils;
import io.onedev.server.util.usage.InUseException;
import io.onedev.server.web.page.simple.SimplePage;
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 630eaeba49..f2ca5958b2 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
@@ -92,8 +92,12 @@ public class PasswordResetPage extends SimplePage {
+ "%s",
user.getDisplayName(), user.getName(), serverUrl, password);
- mailManager.sendMail(settingManager.getMailSetting(), Arrays.asList(user.getEmail()),
- Lists.newArrayList(), "Your OneDev password has been reset", htmlBody, textBody, null, null);
+ mailManager.sendMail(
+ settingManager.getMailSetting(),
+ Arrays.asList(user.getEmail()),
+ Lists.newArrayList(), Lists.newArrayList(),
+ "[Password Reset] Your OneDev Password Has Been Reset",
+ htmlBody, textBody, null, null);
return "Please check your email " + user.getEmail() + " for the reset password";
} else {
throw new ExplicitException("Unable to send password reset email as smtp setting is not defined");
diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/serverinit/ServerInitPage.java b/server-core/src/main/java/io/onedev/server/web/page/simple/serverinit/ServerInitPage.java
index 50e79f0b82..19e27a0dd3 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/simple/serverinit/ServerInitPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/serverinit/ServerInitPage.java
@@ -41,7 +41,7 @@ public class ServerInitPage extends SimplePage {
final ManualConfig lastConfig = clonedConfigs.remove(clonedConfigs.size()-1);
clonedConfigs.add(new ManualConfig(lastConfig.getTitle(), lastConfig.getDescription(),
- lastConfig.getSetting(), lastConfig.getExcludeProperties()) {
+ lastConfig.getSetting(), lastConfig.getExcludeProperties(), lastConfig.isForceOrdinaryStyle()) {
@Override
public Skippable getSkippable() {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/simple.css b/server-core/src/main/java/io/onedev/server/web/page/simple/simple.css
index 0b0ad9f0e7..701462ef72 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/simple/simple.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/simple.css
@@ -8,9 +8,11 @@
}
.SimplePage .main {
padding: 1.75rem;
- width: 450px;
margin: auto;
}
+.SimplePage:not(.force-ordinary-style) .main {
+ width: 450px;
+}
.SimplePage.GeneralErrorPage .main {
width: 900px;
}
@@ -18,6 +20,9 @@
width: auto;
}
+.force-ordinary-style .bean-editor {
+ text-align: left !important;
+}
.SimplePage .main .logo.icon {
color: var(--primary);
margin-bottom: 3rem;
@@ -25,7 +30,7 @@
.SimplePage .main .title {
margin-bottom: 5rem;
}
-.SimplePage .main .btn:not(.btn-block) {
+.SimplePage:not(.force-ordinary-style) .main .btn:not(.btn-block) {
padding: 1rem 2.25rem;
margin: 0.75rem 1rem;
}
@@ -43,18 +48,18 @@
text-align: left;
margin-bottom: 1.5rem;
}
-.SimplePage .main .form-group {
+.SimplePage:not(.force-ordinary-style) .main .form-group {
margin-bottom: 1.5rem;
text-align: left;
}
-.SimplePage .main .form-control {
+.SimplePage:not(.force-ordinary-style) .main .form-control {
padding: 1rem 2rem;
background-color: var(--light);
border-color: var(--light);
color: var(--gray-dark);
height: auto;
}
-.SimplePage .main .form-control:focus {
+.SimplePage:not(.force-ordinary-style) .main .form-control:focus {
background-color: var(--light-gray);
border-color: var(--light-gray);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/util/ReferenceTransformer.java b/server-core/src/main/java/io/onedev/server/web/util/ReferenceTransformer.java
index 589f5d4db1..4cdea9d057 100644
--- a/server-core/src/main/java/io/onedev/server/web/util/ReferenceTransformer.java
+++ b/server-core/src/main/java/io/onedev/server/web/util/ReferenceTransformer.java
@@ -11,12 +11,12 @@ import org.jsoup.nodes.Node;
import org.jsoup.nodes.TextNode;
import org.unbescape.html.HtmlEscape;
+import io.onedev.server.entityreference.ReferenceParser;
import io.onedev.server.model.Build;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.util.ProjectScopedNumber;
-import io.onedev.server.util.markdown.ReferenceParser;
import io.onedev.server.web.page.project.builds.detail.dashboard.BuildDashboardPage;
import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;
import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;
diff --git a/server-core/src/main/java/org/eclipse/jetty/server/Response.java b/server-core/src/main/java/org/eclipse/jetty/server/Response.java
index 4efa5e6fbe..296d2f1626 100644
--- a/server-core/src/main/java/org/eclipse/jetty/server/Response.java
+++ b/server-core/src/main/java/org/eclipse/jetty/server/Response.java
@@ -553,14 +553,14 @@ public class Response implements HttpServletResponse
if (location.startsWith("/"))
{
// absolute in context
- location = URIUtil.canonicalEncodedPath(location);
+ location = URIUtil.canonicalURI(location);
}
else
{
// relative to request
String path = _channel.getRequest().getRequestURI();
String parent = (path.endsWith("/")) ? path : URIUtil.parentPath(path);
- location = URIUtil.canonicalEncodedPath(URIUtil.addEncodedPaths(parent, location));
+ location = URIUtil.canonicalURI(URIUtil.addEncodedPaths(parent, location));
if (location != null && !location.startsWith("/"))
buf.append('/');
}
diff --git a/server-core/src/test/java/io/onedev/server/util/ReferenceMigratorTest.java b/server-core/src/test/java/io/onedev/server/util/ReferenceMigratorTest.java
index 179199872b..d8efd1826a 100644
--- a/server-core/src/test/java/io/onedev/server/util/ReferenceMigratorTest.java
+++ b/server-core/src/test/java/io/onedev/server/util/ReferenceMigratorTest.java
@@ -4,6 +4,7 @@ import static org.junit.Assert.*;
import org.junit.Test;
+import io.onedev.server.entityreference.ReferenceMigrator;
import io.onedev.server.model.Issue;
public class ReferenceMigratorTest {
diff --git a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportUtils.java b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportUtils.java
index 731c674c1e..6040ea75c1 100644
--- a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportUtils.java
+++ b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportUtils.java
@@ -31,6 +31,7 @@ import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.entitymanager.UserManager;
+import io.onedev.server.entityreference.ReferenceMigrator;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueComment;
import io.onedev.server.model.IssueField;
@@ -46,7 +47,6 @@ import io.onedev.server.util.DateUtils;
import io.onedev.server.util.JerseyUtils;
import io.onedev.server.util.JerseyUtils.PageDataConsumer;
import io.onedev.server.util.Pair;
-import io.onedev.server.util.ReferenceMigrator;
import io.onedev.server.util.SimpleLogger;
public class ImportUtils {
diff --git a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportUtils.java b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportUtils.java
index 9ea0f25b5f..ce226ecd6c 100644
--- a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportUtils.java
+++ b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportUtils.java
@@ -32,6 +32,7 @@ import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.entitymanager.UserManager;
+import io.onedev.server.entityreference.ReferenceMigrator;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueComment;
import io.onedev.server.model.IssueField;
@@ -45,7 +46,6 @@ import io.onedev.server.model.support.issue.field.spec.FieldSpec;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.util.JerseyUtils.PageDataConsumer;
import io.onedev.server.util.Pair;
-import io.onedev.server.util.ReferenceMigrator;
import io.onedev.server.util.SimpleLogger;
public class ImportUtils {
diff --git a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportUtils.java b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportUtils.java
index 448cbf2cc3..83893e3b1a 100644
--- a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportUtils.java
+++ b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportUtils.java
@@ -36,6 +36,7 @@ import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.entitymanager.UserManager;
+import io.onedev.server.entityreference.ReferenceMigrator;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueComment;
import io.onedev.server.model.IssueField;
@@ -52,7 +53,6 @@ import io.onedev.server.util.DateUtils;
import io.onedev.server.util.JerseyUtils;
import io.onedev.server.util.JerseyUtils.PageDataConsumer;
import io.onedev.server.util.Pair;
-import io.onedev.server.util.ReferenceMigrator;
import io.onedev.server.util.SimpleLogger;
public class ImportUtils {
diff --git a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportUtils.java b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportUtils.java
index 24ff39c11d..ea4b212a92 100644
--- a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportUtils.java
+++ b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportUtils.java
@@ -40,6 +40,7 @@ import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.entitymanager.UserManager;
+import io.onedev.server.entityreference.ReferenceMigrator;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueComment;
import io.onedev.server.model.IssueField;
@@ -54,7 +55,6 @@ import io.onedev.server.util.DateUtils;
import io.onedev.server.util.JerseyUtils;
import io.onedev.server.util.JerseyUtils.PageDataConsumer;
import io.onedev.server.util.Pair;
-import io.onedev.server.util.ReferenceMigrator;
import io.onedev.server.util.SimpleLogger;
public class ImportUtils {
diff --git a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportUtils.java b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportUtils.java
index 1235d634ac..5d05f9e7c6 100644
--- a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportUtils.java
+++ b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportUtils.java
@@ -33,6 +33,7 @@ import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.entitymanager.UserManager;
+import io.onedev.server.entityreference.ReferenceMigrator;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueComment;
import io.onedev.server.model.IssueField;
@@ -57,7 +58,6 @@ import io.onedev.server.util.DateUtils;
import io.onedev.server.util.JerseyUtils;
import io.onedev.server.util.JerseyUtils.PageDataConsumer;
import io.onedev.server.util.Pair;
-import io.onedev.server.util.ReferenceMigrator;
import io.onedev.server.util.SimpleLogger;
public class ImportUtils {