The Unified and Autonomous Development Platform
Fix issue #1277 - Pull request opened activity displayed twice when open a new pull request
Robin Shen7479c092b019
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.javaindex 7958236cf5..dc2680883a 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@@ -305,6 +305,8 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>request.setNumberScope(request.getTargetProject().getForkRoot());request.setNumber(numberGenerator.getNextSequence(request.getNumberScope()));request.setSubmitDate(new Date());+ for (var update: request.getUpdates())+ update.setDate(new DateTime().plusMillis(1).toDate());LastActivity lastActivity = new LastActivity();lastActivity.setUser(request.getSubmitter());diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.javaindex e69d0fe820..3bdfd60a44 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java@@ -232,7 +232,6 @@ public class NewPullRequestPage extends ProjectPage implements RevisionDiff.Annorequest.setStatus(Status.MERGED);PullRequestUpdate update = new PullRequestUpdate();- update.setDate(new DateTime(request.getSubmitDate()).plusSeconds(1).toDate());request.getUpdates().add(update);request.setUpdates(request.getUpdates());update.setRequest(request);