Skip to content

The Unified and Autonomous Development Platform

Bug fixes. Improvements. Refactorings

Robin Shene03d9ed8fb79
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 d109076771..7084a25a2f 100644
--- a/server-core/src/main/java/io/onedev/server/CoreModule.java
+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java
@@ -391,8 +391,6 @@ public class CoreModule extends AbstractPluginModule {
contribute(ObjectMapperConfigurator.class, GitObjectMapperConfigurator.class);
contribute(ObjectMapperConfigurator.class, HibernateObjectMapperConfigurator.class);
- contribute(PersistListener.class, PullRequestNotificationManager.class);
-
bind(Realm.class).to(OneAuthorizingRealm.class);
bind(RememberMeManager.class).to(OneRememberMeManager.class);
bind(WebSecurityManager.class).to(OneWebSecurityManager.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 ccc57e9510..2e07cc3245 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
@@ -16,8 +16,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/IssueWatchManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/IssueWatchManager.java
index 7d1304fb3a..87b6ad6cb9 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/IssueWatchManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/IssueWatchManager.java
@@ -12,4 +12,6 @@ public interface IssueWatchManager extends EntityManager<IssueWatch> {
@Nullable
IssueWatch find(Issue issue, User user);
+ void watch(Issue issue, User user, boolean watching);
+
}
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/PullRequestWatchManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestWatchManager.java
index 5fd7aa725e..fd5857d567 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestWatchManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestWatchManager.java
@@ -12,4 +12,5 @@ public interface PullRequestWatchManager extends EntityManager<PullRequestWatch>
@Nullable
PullRequestWatch find(PullRequest request, User user);
+ void watch(PullRequest request, User user, boolean watching);
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java
index 4b79caaa64..bceb468a0a 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java
@@ -86,8 +86,11 @@ public class DefaultCodeCommentManager extends AbstractEntityManager<CodeComment
@Override
public void create(CodeComment comment, PullRequest request) {
Preconditions.checkArgument(comment.isNew());
- save(comment);
+
CodeCommentCreated event = new CodeCommentCreated(comment, request);
+ comment.setLastUpdate(event.getLastUpdate());
+ save(comment);
+
listenerRegistry.post(event);
}
@@ -104,7 +107,8 @@ public class DefaultCodeCommentManager extends AbstractEntityManager<CodeComment
@Transactional
@Listen
public void on(CodeCommentEvent event) {
- event.getComment().setUpdateDate(event.getDate());
+ if (!(event instanceof CodeCommentCreated))
+ event.getComment().setLastUpdate(event.getLastUpdate());
}
@Sessional
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentRelationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentRelationManager.java
index a222a5157e..cd5e325f4c 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentRelationManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentRelationManager.java
@@ -46,7 +46,7 @@ public class DefaultCodeCommentRelationManager extends AbstractEntityManager<Cod
request.setCommentCount(request.getCommentCount() + relation.getComment().getReplyCount() + 1);
super.save(relation);
CodeComment comment = relation.getComment();
- if (comment.getCreateDate().after(request.getUpdateDate())) {
+ if (comment.getCreateDate().after(request.getLastUpdate().getDate())) {
PullRequestCodeCommentCreated event = new PullRequestCodeCommentCreated(request, comment, derived);
listenerRegistry.post(event);
}
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 9b565eb413..8a1a9d01e6 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
@@ -45,7 +45,6 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.support.issue.changedata.IssueBatchUpdateData;
import io.onedev.server.model.support.issue.changedata.IssueCommittedData;
-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.IssuePullRequestDiscardedData;
@@ -128,22 +127,6 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<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);
- }
- }
-
private void checkBuild(TransitionSpec transition, Build build) {
if (transition.getTrigger() instanceof BuildSuccessfulTrigger) {
Project project = build.getProject();
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 1ddb1aa6d4..2dbb71fc3a 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
@@ -40,6 +40,7 @@ import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.event.entity.EntityRemoved;
+import io.onedev.server.event.issue.IssueChangeEvent;
import io.onedev.server.event.issue.IssueEvent;
import io.onedev.server.event.issue.IssueOpened;
import io.onedev.server.event.system.SystemStarted;
@@ -52,6 +53,10 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
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.persistence.TransactionManager;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
@@ -154,11 +159,15 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements
Query<?> query = getSession().createQuery("select max(number) from Issue where project=:project");
query.setParameter("project", issue.getProject());
issue.setNumber(getNextNumber(issue.getProject(), query));
+
+ IssueOpened event = new IssueOpened(issue);
+ issue.setLastUpdate(event.getLastUpdate());
+
save(issue);
issueFieldManager.saveFields(issue);
- listenerRegistry.post(new IssueOpened(issue));
+ listenerRegistry.post(event);
}
@Transactional
@@ -255,7 +264,18 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements
@Transactional
@Listen
public void on(IssueEvent event) {
- event.getIssue().setUpdateDate(event.getDate());
+ boolean minorChange = false;
+ if (event instanceof IssueChangeEvent) {
+ IssueChangeData changeData = ((IssueChangeEvent)event).getChange().getData();
+ if (changeData instanceof IssueReferencedFromCodeCommentData
+ || changeData instanceof IssueReferencedFromIssueData
+ || changeData instanceof IssueReferencedFromPullRequestData) {
+ minorChange = true;
+ }
+ }
+
+ if (!(event instanceof IssueOpened || minorChange))
+ event.getIssue().setLastUpdate(event.getLastUpdate());
}
@Sessional
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueWatchManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueWatchManager.java
index 1cd284b667..f7f92473f3 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueWatchManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueWatchManager.java
@@ -29,5 +29,14 @@ public class DefaultIssueWatchManager extends AbstractEntityManager<IssueWatch>
criteria.add(Restrictions.eq("user", user));
return find(criteria);
}
+
+ @Override
+ public void watch(Issue issue, User user, boolean watching) {
+ IssueWatch watch = (IssueWatch) issue.getWatch(user, true);
+ if (watch.isNew()) {
+ watch.setWatching(watching);
+ save(watch);
+ }
+ }
}
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 7e53ce979d..17a4db33d8 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 AbstractEntityManager<PullR
}
}
- @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 a09798d048..57aac54afc 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
@@ -20,6 +20,8 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutorService;
import java.util.stream.Collectors;
import javax.annotation.Nullable;
@@ -56,6 +58,7 @@ import com.google.common.collect.Lists;
import io.onedev.commons.launcher.loader.Listen;
import io.onedev.commons.launcher.loader.ListenerRegistry;
import io.onedev.commons.utils.ExceptionUtils;
+import io.onedev.commons.utils.LockUtils;
import io.onedev.server.OneDev;
import io.onedev.server.OneException;
import io.onedev.server.buildspec.BuildSpec;
@@ -102,6 +105,9 @@ 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;
@@ -166,12 +172,14 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
private final JobManager jobManager;
+ private final ExecutorService executorService;
+
@Inject
public DefaultPullRequestManager(Dao dao, PullRequestUpdateManager pullRequestUpdateManager,
PullRequestReviewManager pullRequestReviewManager, UserManager userManager,
MarkdownManager markdownManager, BatchWorkManager batchWorkManager,
ListenerRegistry listenerRegistry, SessionManager sessionManager,
- PullRequestChangeManager pullRequestChangeManager,
+ PullRequestChangeManager pullRequestChangeManager, ExecutorService executorService,
PullRequestBuildManager pullRequestBuildManager, TransactionManager transactionManager,
JobManager jobManager, ProjectManager projectManager) {
super(dao);
@@ -185,6 +193,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
this.listenerRegistry = listenerRegistry;
this.pullRequestChangeManager = pullRequestChangeManager;
this.pullRequestBuildManager = pullRequestBuildManager;
+ this.executorService = executorService;
this.jobManager = jobManager;
this.projectManager = projectManager;
}
@@ -356,6 +365,9 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
query.setParameter("project", request.getTargetProject());
request.setNumber(getNextNumber(request.getTargetProject(), query));
+ PullRequestOpened event = new PullRequestOpened(request);
+ request.setLastUpdate(event.getLastUpdate());
+
dao.persist(request);
RefUpdate refUpdate = GitUtils.getRefUpdate(request.getTargetProject().getRepository(), request.getBaseRef());
@@ -374,7 +386,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
checkAsync(Lists.newArrayList(request));
- listenerRegistry.post(new PullRequestOpened(request));
+ listenerRegistry.post(event);
}
private void closeAsMerged(PullRequest request, boolean dueToMerged) {
@@ -441,6 +453,10 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
} else {
checkQuality(request);
+ /*
+ * If the check method runs concurrently, below statements may fail. It will
+ * not do any harm except that the transaction rolls back
+ */
pullRequestReviewManager.saveReviews(request);
pullRequestBuildManager.savePullRequestBuilds(request);
@@ -652,7 +668,25 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
@Transactional
@Listen
public void on(PullRequestEvent event) {
- event.getRequest().setUpdateDate(event.getDate());
+ boolean minorChange = false;
+ if (event instanceof PullRequestChangeEvent) {
+ PullRequestChangeData changeData = ((PullRequestChangeEvent)event).getChange().getData();
+ if (changeData instanceof PullRequestReviewerAddData
+ || changeData instanceof PullRequestReviewerRemoveData
+ || changeData instanceof PullRequestSourceBranchDeleteData
+ || changeData instanceof PullRequestSourceBranchRestoreData
+ || changeData instanceof PullRequestReferencedFromCodeCommentData
+ || changeData instanceof PullRequestReferencedFromIssueData
+ || changeData instanceof PullRequestReferencedFromPullRequestData) {
+ minorChange = true;
+ }
+ }
+ if (!(event instanceof PullRequestOpened
+ || event instanceof PullRequestMergePreviewCalculated
+ || event instanceof PullRequestBuildEvent
+ || minorChange)) {
+ event.getRequest().setLastUpdate(event.getLastUpdate());
+ }
}
@Transactional
@@ -686,12 +720,33 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest
@Override
public void run() {
- dao.getSessionManager().runAsync(new Runnable() {
-
+ executorService.execute(new Runnable() {
+
@Override
public void run() {
- for (Long requestId: requestIds)
- check(load(requestId));
+ for (Long requestId: requestIds) {
+ /*
+ * Lock here to minimize concurrent checks against the same pull request. We
+ * can not lock the check method directly as the lock should be put outside
+ * of transaction
+ */
+ LockUtils.call("request-" + requestId + "-check", new Callable<Void>() {
+
+ @Override
+ public Void call() throws Exception {
+ sessionManager.run(new Runnable() {
+
+ @Override
+ public void run() {
+ check(load(requestId));
+ }
+
+ });
+ return null;
+ }
+
+ });
+ }
}
});
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestReviewManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestReviewManager.java
index b3cf082065..d498977a71 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestReviewManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestReviewManager.java
@@ -67,7 +67,7 @@ public class DefaultPullRequestReviewManager extends AbstractEntityManager<PullR
.add(Restrictions.eq("commit", commit));
return find(criteria);
}
-
+
@Transactional
@Override
public boolean excludeReviewer(PullRequestReview review) {
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestWatchManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestWatchManager.java
index aec80a50f3..69d5986281 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestWatchManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestWatchManager.java
@@ -29,5 +29,14 @@ public class DefaultPullRequestWatchManager extends AbstractEntityManager<PullRe
criteria.add(Restrictions.eq("user", user));
return find(criteria);
}
+
+ @Override
+ public void watch(PullRequest request, User user, boolean watching) {
+ PullRequestWatch watch = (PullRequestWatch) request.getWatch(user, true);
+ if (watch.isNew()) {
+ watch.setWatching(watching);
+ save(watch);
+ }
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java
index f1a6a7c2a8..d6bbd97fa5 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserManager.java
@@ -150,6 +150,12 @@ public class DefaultUserManager extends AbstractEntityManager<User> implements U
query.setParameter("userName", user.getDisplayName());
query.executeUpdate();
+ query = getSession().createQuery("update PullRequest set lastUpdate.user=null, "
+ + "lastUpdate.userName=:userName where lastUpdate.user=:user");
+ query.setParameter("user", user);
+ query.setParameter("userName", user.getDisplayName());
+ query.executeUpdate();
+
query = getSession().createQuery("update PullRequestChange set user=null, userName=:userName where user=:user");
query.setParameter("user", user);
query.setParameter("userName", user.getDisplayName());
@@ -165,6 +171,12 @@ public class DefaultUserManager extends AbstractEntityManager<User> implements U
query.setParameter("userName", user.getDisplayName());
query.executeUpdate();
+ query = getSession().createQuery("update CodeComment set lastUpdate.user=null, lastUpdate.userName=:userName "
+ + "where lastUpdate.user=:user");
+ query.setParameter("user", user);
+ query.setParameter("userName", user.getDisplayName());
+ query.executeUpdate();
+
query = getSession().createQuery("update CodeCommentReply set user=null, userName=:userName where user=:user");
query.setParameter("user", user);
query.setParameter("userName", user.getDisplayName());
@@ -176,6 +188,12 @@ public class DefaultUserManager extends AbstractEntityManager<User> implements U
query.setParameter("submitterName", user.getDisplayName());
query.executeUpdate();
+ query = getSession().createQuery("update Issue set lastUpdate.user=null, lastUpdate.userName=:userName "
+ + "where lastUpdate.user=:user");
+ query.setParameter("user", user);
+ query.setParameter("userName", user.getDisplayName());
+ query.executeUpdate();
+
query = getSession().createQuery("update IssueComment set user=null, userName=:userName where user=:user");
query.setParameter("user", user);
query.setParameter("userName", user.getDisplayName());
diff --git a/server-core/src/main/java/io/onedev/server/event/ProjectCreated.java b/server-core/src/main/java/io/onedev/server/event/ProjectCreated.java
index 65db6b7e21..f92be66c36 100644
--- a/server-core/src/main/java/io/onedev/server/event/ProjectCreated.java
+++ b/server-core/src/main/java/io/onedev/server/event/ProjectCreated.java
@@ -9,4 +9,12 @@ public class ProjectCreated extends ProjectEvent {
super(SecurityUtils.getUser(), project.getCreateDate(), project);
}
+ @Override
+ public String getActivity(boolean withEntity) {
+ String activity = "created";
+ if (withEntity)
+ activity += " project " + getProject().getName();
+ return activity;
+ }
+
}
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 2a3f9c2f9d..83674cb906 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
@@ -4,6 +4,7 @@ import java.util.Date;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
+import io.onedev.server.model.support.LastUpdate;
public abstract class ProjectEvent extends Event {
@@ -18,4 +19,13 @@ public abstract class ProjectEvent extends Event {
return project;
}
+ public abstract String getActivity(boolean withEntity);
+
+ public LastUpdate getLastUpdate() {
+ LastUpdate lastUpdate = new LastUpdate();
+ lastUpdate.setUser(getUser());
+ lastUpdate.setActivity(getActivity(false));
+ lastUpdate.setDate(getDate());
+ return lastUpdate;
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/event/RefUpdated.java b/server-core/src/main/java/io/onedev/server/event/RefUpdated.java
index dee48db03b..3e4a7ac2d8 100644
--- a/server-core/src/main/java/io/onedev/server/event/RefUpdated.java
+++ b/server-core/src/main/java/io/onedev/server/event/RefUpdated.java
@@ -43,5 +43,13 @@ public class RefUpdated extends ProjectEvent implements CommitAware {
commit = new ProjectAwareCommit(getProject(), newCommitId);
return commit;
}
+
+ @Override
+ public String getActivity(boolean withEntity) {
+ String activity = "Git ref updated";
+ if (withEntity)
+ activity += " in project " + getProject().getName();
+ return activity;
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/event/build/BuildEvent.java b/server-core/src/main/java/io/onedev/server/event/build/BuildEvent.java
index 5d1bd0b218..1c1e737bd2 100644
--- a/server-core/src/main/java/io/onedev/server/event/build/BuildEvent.java
+++ b/server-core/src/main/java/io/onedev/server/event/build/BuildEvent.java
@@ -32,4 +32,17 @@ public class BuildEvent extends ProjectEvent implements CommitAware {
return new ProjectAwareCommit(build.getProject(), ObjectId.fromString(build.getCommitHash()));
}
+ @Override
+ public String getActivity(boolean withEntity) {
+ String activity = build.getStatus().getDisplayName();
+ if (withEntity) {
+ activity = " is " + activity;
+ if (build.getVersion() != null)
+ activity = "build #" + build.getNumber() + " (" + build.getVersion() + ")" + activity;
+ else
+ activity = "build #" + build.getNumber() + activity;
+ }
+ return activity;
+ }
+
}
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 34882c358d..d1aa455fbe 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
@@ -15,4 +15,12 @@ public class CodeCommentCreated extends CodeCommentEvent implements MarkdownAwar
return getComment().getContent();
}
+ @Override
+ public String getActivity(boolean withEntity) {
+ String activity = "commented";
+ if (withEntity)
+ activity += " on file " + getComment().getMarkPos().getPath();
+ return activity;
+ }
+
}
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 5d20705913..93e6abba63 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
@@ -22,4 +22,12 @@ public class CodeCommentReplied extends CodeCommentEvent implements MarkdownAwar
return reply.getContent();
}
+ @Override
+ public String getActivity(boolean withEntity) {
+ String activity = "replied comment";
+ if (withEntity)
+ activity += " on file " + getComment().getMarkPos().getPath();
+ return activity;
+ }
+
}
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 4b939f76d5..43b63e9df2 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
@@ -17,4 +17,12 @@ public class CodeCommentUpdated extends CodeCommentEvent implements MarkdownAwar
return getComment().getContent();
}
+ @Override
+ public String getActivity(boolean withEntity) {
+ String activity = "updated comment";
+ if (withEntity)
+ activity += " on file " + getComment().getMarkPos().getPath();
+ return activity;
+ }
+
}
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 9e60e31046..44b33a9339 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
@@ -44,4 +44,9 @@ public class IssueChangeEvent extends IssueEvent implements MarkdownAware {
return change.getData().getNewGroups();
}
+ @Override
+ public String getActivity(boolean withEntity) {
+ return getChange().getData().getActivity(withEntity?getChange().getIssue():null);
+ }
+
}
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 bb7272f469..5159bb5ef7 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
@@ -26,4 +26,12 @@ public class IssueCommented extends IssueEvent implements MarkdownAware {
return false;
}
+ @Override
+ public String getActivity(boolean withEntity) {
+ String activity = "commented";
+ if (withEntity)
+ activity += " on issue " + comment.getIssue().describe();
+ return activity;
+ }
+
}
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 b96a54675c..658cbe44b9 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
@@ -66,4 +66,12 @@ public class IssueOpened extends IssueEvent implements MarkdownAware {
return newGroups;
}
+ @Override
+ public String getActivity(boolean withEntity) {
+ String activity = "opened";
+ if (withEntity)
+ activity += " issue " + getIssue().describe();
+ return activity;
+ }
+
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestBuildEvent.java b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestBuildEvent.java
index ba29e48b7c..46201c27d0 100644
--- a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestBuildEvent.java
+++ b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestBuildEvent.java
@@ -2,6 +2,7 @@ package io.onedev.server.event.pullrequest;
import java.util.Date;
+import io.onedev.server.model.Build;
import io.onedev.server.model.PullRequestBuild;
public class PullRequestBuildEvent extends PullRequestEvent {
@@ -17,4 +18,18 @@ public class PullRequestBuildEvent extends PullRequestEvent {
return pullRequestBuild;
}
+ @Override
+ public String getActivity(boolean withEntity) {
+ Build build = pullRequestBuild.getBuild();
+ String activity = build.getJobName() + " ";
+ if (build.getVersion() != null)
+ activity = "build #" + build.getNumber() + " (" + build.getVersion() + ")";
+ else
+ activity = "build #" + build.getNumber();
+ activity += " is " + build.getStatus().getDisplayName();
+ if (withEntity)
+ activity += " for pull request " + pullRequestBuild.getRequest().describe();
+ return activity;
+ }
+
}
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 d5c5c99ba7..de7bb1368f 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
@@ -24,4 +24,9 @@ public class PullRequestChangeEvent extends PullRequestEvent implements Markdown
return null;
}
+ @Override
+ public String getActivity(boolean withEntity) {
+ return change.getData().getActivity(withEntity?change.getRequest():null);
+ }
+
}
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 dea58d134e..79e20bd19a 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
@@ -15,4 +15,12 @@ public class PullRequestCodeCommentCreated extends PullRequestCodeCommentEvent i
return getComment().getContent();
}
+ @Override
+ public String getActivity(boolean withEntity) {
+ String activity = "created code comment on file '" + getComment().getMarkPos().getPath() + "'";
+ if (withEntity)
+ activity += " in pull request " + getRequest().describe();
+ return activity;
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentReplied.java b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentReplied.java
index 022f8c565c..9f6e2f1def 100644
--- a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentReplied.java
+++ b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentReplied.java
@@ -21,4 +21,12 @@ public class PullRequestCodeCommentReplied extends PullRequestCodeCommentEvent {
return reply.getContent();
}
+ @Override
+ public String getActivity(boolean withEntity) {
+ String activity = "replied code comment on file '" + getComment().getMarkPos().getPath() + "'";
+ if (withEntity)
+ activity += " in pull request " + getRequest().describe();
+ return activity;
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCommentCreated.java b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCommentCreated.java
index c8cd9ce7df..5e99ed8d92 100644
--- a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCommentCreated.java
+++ b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCommentCreated.java
@@ -21,4 +21,12 @@ public class PullRequestCommentCreated extends PullRequestEvent implements Markd
return getComment().getContent();
}
+ @Override
+ public String getActivity(boolean withEntity) {
+ String activity = "commented";
+ if (withEntity)
+ activity += " on pull request " + getRequest().describe();
+ return activity;
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestMergePreviewCalculated.java b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestMergePreviewCalculated.java
index ddb5ae2cb3..618a0c11d6 100644
--- a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestMergePreviewCalculated.java
+++ b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestMergePreviewCalculated.java
@@ -10,4 +10,12 @@ public class PullRequestMergePreviewCalculated extends PullRequestEvent {
super(null, new Date(), request);
}
+ @Override
+ public String getActivity(boolean withEntity) {
+ String activity = "Merge preview calculated";
+ if (withEntity)
+ activity += " in pull request " + getRequest().describe();
+ return activity;
+ }
+
}
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 941ecef3b9..cc5dbcb73c 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
@@ -14,4 +14,12 @@ public class PullRequestOpened extends PullRequestEvent implements MarkdownAware
return getRequest().getDescription();
}
+ @Override
+ public String getActivity(boolean withEntity) {
+ String activity = "opened";
+ if (withEntity)
+ activity += " pull request " + getRequest().describe();
+ return activity;
+ }
+
}
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 f7ae52d433..ec395de0ce 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
@@ -15,4 +15,12 @@ public class PullRequestUpdated extends PullRequestEvent {
return update;
}
+ @Override
+ public String getActivity(boolean withEntity) {
+ String activity = "Commits added";
+ if (withEntity)
+ activity += " in pull request " + getRequest().describe();
+ return activity;
+ }
+
}
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 a3859d45b0..441d9d6bd9 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
@@ -1429,7 +1429,75 @@ public class DataMigrator {
private void migrate35(File dataDir, Stack<Integer> versions) {
for (File file: dataDir.listFiles()) {
- if (file.getName().startsWith("Projects.xml")) {
+ if (file.getName().startsWith("CodeComments.xml")) {
+ VersionedDocument dom = VersionedDocument.fromFile(file);
+ for (Element element: dom.getRootElement().elements()) {
+ element.element("updateDate").detach();
+ Element createDateElement = element.element("createDate");
+ Element lastUpdateElement = element.addElement("lastUpdate");
+ Element userElement = element.element("user");
+ Element lastUpdateUserElement = lastUpdateElement.addElement("user");
+ if (userElement != null)
+ lastUpdateUserElement.setText(userElement.getTextTrim());
+ else
+ lastUpdateUserElement.setText("1");
+ lastUpdateElement.addElement("activity").setText("created");
+ Element dateElement = lastUpdateElement.addElement("date");
+ dateElement.addAttribute("class", createDateElement.attributeValue("class"));
+ dateElement.setText(createDateElement.getTextTrim());
+ }
+ dom.writeToFile(file, false);
+ } else if (file.getName().startsWith("PullRequests.xml")) {
+ VersionedDocument dom = VersionedDocument.fromFile(file);
+ for (Element element: dom.getRootElement().elements()) {
+ element.element("updateDate").detach();
+ Element submitDateElement = element.element("submitDate");
+ Element lastUpdateElement = element.addElement("lastUpdate");
+ Element submitterElement = element.element("submitter");
+ Element lastUpdateUserElement = lastUpdateElement.addElement("user");
+ if (submitterElement != null)
+ lastUpdateUserElement.setText(submitterElement.getTextTrim());
+ else
+ lastUpdateUserElement.setText("1");
+ lastUpdateElement.addElement("activity").setText("opened");
+ Element dateElement = lastUpdateElement.addElement("date");
+ dateElement.addAttribute("class", submitDateElement.attributeValue("class"));
+ dateElement.setText(submitDateElement.getTextTrim());
+ }
+ dom.writeToFile(file, false);
+ } else if (file.getName().startsWith("Issues.xml")) {
+ VersionedDocument dom = VersionedDocument.fromFile(file);
+ for (Element element: dom.getRootElement().elements()) {
+ element.element("updateDate").detach();
+ Element submitDateElement = element.element("submitDate");
+ Element lastUpdateElement = element.addElement("lastUpdate");
+ Element submitterElement = element.element("submitter");
+ Element lastUpdateUserElement = lastUpdateElement.addElement("user");
+ if (submitterElement != null)
+ lastUpdateUserElement.setText(submitterElement.getTextTrim());
+ else
+ lastUpdateUserElement.setText("1");
+ lastUpdateElement.addElement("activity").setText("opened");
+ Element dateElement = lastUpdateElement.addElement("date");
+ dateElement.addAttribute("class", submitDateElement.attributeValue("class"));
+ dateElement.setText(submitDateElement.getTextTrim());
+ }
+ dom.writeToFile(file, false);
+ } else if (file.getName().startsWith("PullRequestChanges.xml")) {
+ VersionedDocument dom = VersionedDocument.fromFile(file);
+ for (Element element: dom.getRootElement().elements()) {
+ if (element.element("data").attributeValue("class").contains("PullRequestDescriptionChangeData"))
+ element.detach();
+ }
+ dom.writeToFile(file, false);
+ } else if (file.getName().startsWith("IssueChanges.xml")) {
+ VersionedDocument dom = VersionedDocument.fromFile(file);
+ for (Element element: dom.getRootElement().elements()) {
+ if (element.element("data").attributeValue("class").contains("IssueDescriptionChangeData"))
+ element.detach();
+ }
+ dom.writeToFile(file, false);
+ } else if (file.getName().startsWith("Projects.xml")) {
VersionedDocument dom = VersionedDocument.fromFile(file);
for (Element element: dom.getRootElement().elements()) {
Element buildSettingElement = element.element("buildSetting");
@@ -1445,6 +1513,12 @@ public class DataMigrator {
for (Element buildPreservationElement: buildSettingElement.element("buildPreservations").elements())
buildPreservationElement.setName("io.onedev.server.model.support.build.BuildPreservation");
buildSettingElement.addElement("actionAuthorizations");
+
+ for (Element tagProtectionElement: element.element("tagProtections").elements()) {
+ Element buildBranchesElement = tagProtectionElement.element("buildBranches");
+ if (buildBranchesElement != null)
+ buildBranchesElement.detach();
+ }
}
dom.writeToFile(file, false);
} else if (file.getName().startsWith("Users.xml")) {
diff --git a/server-core/src/main/java/io/onedev/server/model/CodeComment.java b/server-core/src/main/java/io/onedev/server/model/CodeComment.java
index 7ede920079..5499040360 100644
--- a/server-core/src/main/java/io/onedev/server/model/CodeComment.java
+++ b/server-core/src/main/java/io/onedev/server/model/CodeComment.java
@@ -38,6 +38,7 @@ import io.onedev.server.git.BlobIdent;
import io.onedev.server.git.GitUtils;
import io.onedev.server.infomanager.UserInfoManager;
import io.onedev.server.model.support.CompareContext;
+import io.onedev.server.model.support.LastUpdate;
import io.onedev.server.model.support.MarkPos;
import io.onedev.server.storage.AttachmentStorageSupport;
import io.onedev.server.util.CollectionUtils;
@@ -50,7 +51,7 @@ import io.onedev.server.util.diff.WhitespaceOption;
@Table(indexes={
@Index(columnList="o_project_id"), @Index(columnList="o_user_id"),
@Index(columnList=MarkPos.PROP_COMMIT), @Index(columnList=MarkPos.PROP_PATH),
- @Index(columnList=PROP_CREATE_DATE), @Index(columnList=PROP_UPDATE_DATE)})
+ @Index(columnList=PROP_CREATE_DATE), @Index(columnList=LastUpdate.COLUMN_DATE)})
public class CodeComment extends AbstractEntity implements AttachmentStorageSupport {
private static final long serialVersionUID = 1L;
@@ -77,7 +78,7 @@ public class CodeComment extends AbstractEntity implements AttachmentStorageSupp
public static final String FIELD_UPDATE_DATE = "Update Date";
- public static final String PROP_UPDATE_DATE = "updateDate";
+ public static final String PROP_LAST_UPDATE = "lastUpdate";
public static final String PROP_USER = "user";
@@ -92,7 +93,7 @@ public class CodeComment extends AbstractEntity implements AttachmentStorageSupp
public static final Map<String, String> ORDER_FIELDS = CollectionUtils.newLinkedHashMap(
FIELD_CREATE_DATE, PROP_CREATE_DATE,
- FIELD_UPDATE_DATE, PROP_UPDATE_DATE,
+ FIELD_UPDATE_DATE, PROP_LAST_UPDATE + "." + LastUpdate.PROP_DATE,
FIELD_REPLY_COUNT, PROP_REPLY_COUNT);
@ManyToOne(fetch=FetchType.LAZY)
@@ -111,8 +112,8 @@ public class CodeComment extends AbstractEntity implements AttachmentStorageSupp
@Column(nullable=false)
private Date createDate = new Date();
- @Column(nullable=false)
- private Date updateDate = new Date();
+ @Embedded
+ private LastUpdate lastUpdate;
private int replyCount;
@@ -225,14 +226,14 @@ public class CodeComment extends AbstractEntity implements AttachmentStorageSupp
this.compareContext = compareContext;
}
- public Date getUpdateDate() {
- return updateDate;
+ public LastUpdate getLastUpdate() {
+ return lastUpdate;
}
- public void setUpdateDate(Date updateDate) {
- this.updateDate = updateDate;
+ public void setLastUpdate(LastUpdate lastUpdate) {
+ this.lastUpdate = lastUpdate;
}
-
+
public boolean isVisitedAfter(Date date) {
User user = SecurityUtils.getUser();
if (user != null) {
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 2440bf95fd..efb8e6fd4f 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
@@ -1,6 +1,12 @@
package io.onedev.server.model;
-import static io.onedev.server.model.Issue.*;
+import static io.onedev.server.model.Issue.PROP_COMMENT_COUNT;
+import static io.onedev.server.model.Issue.PROP_NO_SPACE_TITLE;
+import static io.onedev.server.model.Issue.PROP_NUMBER;
+import static io.onedev.server.model.Issue.PROP_STATE;
+import static io.onedev.server.model.Issue.PROP_SUBMIT_DATE;
+import static io.onedev.server.model.Issue.PROP_TITLE;
+import static io.onedev.server.model.Issue.PROP_VOTE_COUNT;
import java.io.Serializable;
import java.util.ArrayList;
@@ -20,6 +26,7 @@ import java.util.stream.Collectors;
import javax.annotation.Nullable;
import javax.persistence.CascadeType;
import javax.persistence.Column;
+import javax.persistence.Embedded;
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.Index;
@@ -49,6 +56,7 @@ import io.onedev.server.infomanager.CommitInfoManager;
import io.onedev.server.infomanager.UserInfoManager;
import io.onedev.server.issue.fieldspec.FieldSpec;
import io.onedev.server.model.support.EntityWatch;
+import io.onedev.server.model.support.LastUpdate;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
import io.onedev.server.storage.AttachmentStorageSupport;
import io.onedev.server.util.CollectionUtils;
@@ -71,7 +79,7 @@ import io.onedev.server.web.editable.annotation.Editable;
@Index(columnList=PROP_NUMBER), @Index(columnList=PROP_SUBMIT_DATE),
@Index(columnList="o_submitter_id"), @Index(columnList=PROP_VOTE_COUNT),
@Index(columnList=PROP_COMMENT_COUNT), @Index(columnList="o_milestone_id"),
- @Index(columnList=PROP_UPDATE_DATE)},
+ @Index(columnList=LastUpdate.COLUMN_DATE)},
uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", PROP_NUMBER})})
@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)
//use dynamic update in order not to overwrite other edits while background threads change update date
@@ -123,7 +131,7 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentSt
public static final String FIELD_UPDATE_DATE = "Update Date";
- public static final String PROP_UPDATE_DATE = "updateDate";
+ public static final String PROP_LAST_UPDATE = "lastUpdate";
public static final String FIELD_MILESTONE = "Milestone";
@@ -151,7 +159,7 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentSt
FIELD_NUMBER, PROP_NUMBER,
FIELD_SUBMIT_DATE, PROP_SUBMIT_DATE,
FIELD_PROJECT, PROP_PROJECT,
- FIELD_UPDATE_DATE, PROP_UPDATE_DATE);
+ FIELD_UPDATE_DATE, PROP_LAST_UPDATE + "." + LastUpdate.PROP_DATE);
@Column(nullable=false)
private String state;
@@ -186,14 +194,14 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentSt
private long number;
+ @Embedded
+ private LastUpdate lastUpdate;
+
// used for title search in markdown editor
@Column(nullable=false)
@JsonView(DefaultView.class)
private String noSpaceTitle;
- @Column(nullable=false)
- private Date updateDate = new Date();
-
@OneToMany(mappedBy="issue", cascade=CascadeType.REMOVE)
private Collection<IssueField> fields = new ArrayList<>();
@@ -265,6 +273,14 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentSt
this.number = number;
}
+ public LastUpdate getLastUpdate() {
+ return lastUpdate;
+ }
+
+ public void setLastUpdate(LastUpdate lastUpdate) {
+ this.lastUpdate = lastUpdate;
+ }
+
public User getSubmitter() {
return submitter;
}
@@ -367,14 +383,6 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentSt
this.fields = fields;
}
- public Date getUpdateDate() {
- return updateDate;
- }
-
- public void setUpdateDate(Date updateDate) {
- this.updateDate = updateDate;
- }
-
public boolean isVisitedAfter(Date date) {
User user = SecurityUtils.getUser();
if (user != null) {
@@ -625,4 +633,8 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentSt
return new ProjectScopedNumber(getProject(), getNumber());
}
+ public String describe() {
+ return "#" + getNumber() + " - " + getTitle();
+ }
+
}
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 87f0502d6e..f6e6d0b720 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
@@ -50,6 +50,7 @@ import io.onedev.server.git.GitUtils;
import io.onedev.server.infomanager.UserInfoManager;
import io.onedev.server.model.support.CompareContext;
import io.onedev.server.model.support.EntityWatch;
+import io.onedev.server.model.support.LastUpdate;
import io.onedev.server.model.support.pullrequest.CloseInfo;
import io.onedev.server.model.support.pullrequest.MergePreview;
import io.onedev.server.model.support.pullrequest.MergeStrategy;
@@ -74,7 +75,7 @@ import io.onedev.server.web.util.WicketUtils;
@Index(columnList=PROP_TITLE), @Index(columnList=PROP_UUID),
@Index(columnList=PROP_NO_SPACE_TITLE), @Index(columnList=PROP_NUMBER),
@Index(columnList="o_targetProject_id"), @Index(columnList=PROP_SUBMIT_DATE),
- @Index(columnList=PROP_UPDATE_DATE), @Index(columnList="o_sourceProject_id"),
+ @Index(columnList=LastUpdate.COLUMN_DATE), @Index(columnList="o_sourceProject_id"),
@Index(columnList="o_submitter_id"), @Index(columnList=PROP_HEAD_COMMIT_HASH),
@Index(columnList=MergePreview.COLUMN_REQUEST_HEAD), @Index(columnList=CloseInfo.COLUMN_DATE),
@Index(columnList=CloseInfo.COLUMN_STATUS), @Index(columnList=CloseInfo.COLUMN_USER),
@@ -137,7 +138,7 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attach
public static final String FIELD_UPDATE_DATE = "Update Date";
- public static final String PROP_UPDATE_DATE = "updateDate";
+ public static final String PROP_LAST_UPDATE = "lastUpdate";
public static final String FIELD_CLOSE_DATE = "Close Date";
@@ -179,7 +180,7 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attach
public static final Map<String, String> ORDER_FIELDS = CollectionUtils.newLinkedHashMap(
FIELD_SUBMIT_DATE, PROP_SUBMIT_DATE,
- FIELD_UPDATE_DATE, PROP_UPDATE_DATE,
+ FIELD_UPDATE_DATE, PROP_LAST_UPDATE + "." + LastUpdate.PROP_DATE,
FIELD_CLOSE_DATE, PROP_CLOSE_DATE,
FIELD_NUMBER, PROP_NUMBER,
FIELD_STATUS, PROP_CLOSE_INFO + "." + CloseInfo.PROP_STATUS,
@@ -232,9 +233,6 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attach
@Column(nullable=false)
private String headCommitHash;
- @Column(nullable=false)
- private Date updateDate = new Date();
-
@Column(nullable=true)
private Date lastCodeCommentActivityDate;
@@ -259,6 +257,9 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attach
private int commentCount;
+ @Embedded
+ private LastUpdate lastUpdate;
+
@OneToMany(mappedBy="request", cascade=CascadeType.REMOVE)
private Collection<PullRequestUpdate> updates = new ArrayList<>();
@@ -736,6 +737,14 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attach
this.commentCount = commentCount;
}
+ public LastUpdate getLastUpdate() {
+ return lastUpdate;
+ }
+
+ public void setLastUpdate(LastUpdate lastUpdate) {
+ this.lastUpdate = lastUpdate;
+ }
+
public List<RevCommit> getCommits() {
List<RevCommit> commits = new ArrayList<>();
getSortedUpdates().forEach(update->commits.addAll(update.getCommits()));
@@ -761,14 +770,6 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attach
}
}
- public Date getUpdateDate() {
- return updateDate;
- }
-
- public void setUpdateDate(Date updateDate) {
- this.updateDate = updateDate;
- }
-
@Nullable
public String getCheckError() {
return checkError;
@@ -1027,4 +1028,8 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attach
}
}
+ public String describe() {
+ return "#" + getNumber() + " - " + getTitle();
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequestReview.java b/server-core/src/main/java/io/onedev/server/model/PullRequestReview.java
index 0204b8b115..d92c9f7d23 100644
--- a/server-core/src/main/java/io/onedev/server/model/PullRequestReview.java
+++ b/server-core/src/main/java/io/onedev/server/model/PullRequestReview.java
@@ -29,8 +29,6 @@ public class PullRequestReview extends AbstractEntity {
public static final String PROP_RESULT = "result";
- public static final String PROP_RESULT_APPROVED = "result.approved";
-
public static final String PROP_EXCLUDE_DATE = "excludeDate";
@ManyToOne(fetch=FetchType.LAZY)
diff --git a/server-core/src/main/java/io/onedev/server/model/support/LastUpdate.java b/server-core/src/main/java/io/onedev/server/model/support/LastUpdate.java
new file mode 100644
index 0000000000..f8794cad55
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/model/support/LastUpdate.java
@@ -0,0 +1,74 @@
+package io.onedev.server.model.support;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Embeddable;
+import javax.persistence.FetchType;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+
+import io.onedev.server.model.User;
+
+@Embeddable
+public class LastUpdate implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final String COLUMN_USER = "LAST_UPDATE_USER";
+
+ public static final String COLUMN_USER_NAME = "LAST_UPDATE_USER_NAME";
+
+ public static final String COLUMN_DATE = "LAST_UPDATE_DATE";
+
+ public static final String COLUMN_ACTIVITY = "LAST_UPDATE_ACTIVITY";
+
+ public static final String PROP_DATE = "date";
+
+ @ManyToOne(fetch=FetchType.LAZY)
+ @JoinColumn(name=COLUMN_USER)
+ private User user;
+
+ @Column(name=COLUMN_USER_NAME)
+ private String userName;
+
+ @Column(name=COLUMN_DATE, nullable=false)
+ private Date date;
+
+ @Column(name=COLUMN_ACTIVITY, nullable=false)
+ private String activity;
+
+ public User getUser() {
+ return user;
+ }
+
+ public void setUser(User user) {
+ this.user = user;
+ }
+
+ public String getUserName() {
+ return userName;
+ }
+
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+
+ public Date getDate() {
+ return date;
+ }
+
+ public void setDate(Date date) {
+ this.date = date;
+ }
+
+ public String getActivity() {
+ return activity;
+ }
+
+ public void setActivity(String activity) {
+ this.activity = activity;
+ }
+
+}
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 1c2ec2d3dd..4b58b44ec6 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
@@ -9,6 +9,7 @@ import org.apache.wicket.Component;
import com.google.common.base.Objects;
+import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueChange;
import io.onedev.server.model.Milestone;
import io.onedev.server.util.CommentSupport;
@@ -148,8 +149,11 @@ public class IssueBatchUpdateData extends IssueFieldChangeData {
}
@Override
- public String getDescription() {
- return "batch edited";
+ public String getActivity(Issue withIssue) {
+ String activity = "batch edited";
+ if (withIssue != null)
+ activity += " issue " + withIssue.describe();
+ return activity;
}
}
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 29c88bcf0f..10ebe410fc 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
@@ -9,6 +9,7 @@ import javax.annotation.Nullable;
import org.apache.wicket.Component;
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.util.CommentSupport;
@@ -17,7 +18,7 @@ public interface IssueChangeData extends Serializable {
Component render(String componentId, IssueChange change);
- String getDescription();
+ String getActivity(@Nullable Issue withIssue);
@Nullable
CommentSupport getCommentSupport();
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueCommittedData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueCommittedData.java
index 175583b0a4..be44509142 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueCommittedData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueCommittedData.java
@@ -41,8 +41,11 @@ public class IssueCommittedData implements IssueChangeData {
}
@Override
- public String getDescription() {
- return "New commit fixing this issue added";
+ public String getActivity(Issue withIssue) {
+ if (withIssue != null)
+ return "Commit added fixing issue " + withIssue.describe();
+ else
+ return "Commit added fixing this issue";
}
@Override
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 caf225d198..0000000000
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssueDescriptionChangeData.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package io.onedev.server.model.support.issue.changedata;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.wicket.Component;
-
-import io.onedev.commons.utils.StringUtils;
-import io.onedev.server.model.Group;
-import io.onedev.server.model.IssueChange;
-import io.onedev.server.model.User;
-import io.onedev.server.util.CommentSupport;
-import io.onedev.server.web.component.diff.plain.PlainDiffPanel;
-
-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;
- }
-
- @Override
- public Component render(String componentId, IssueChange change) {
- List<String> oldLines = StringUtils.splitAndTrim(oldDescription, "\n");
- List<String> newLines = StringUtils.splitAndTrim(newDescription, "\n");
- return new PlainDiffPanel(componentId, oldLines, "a.txt", newLines, "b.txt", true);
- }
-
- @Override
- public String getDescription() {
- return "changed description";
- }
-
- @Override
- public CommentSupport getCommentSupport() {
- 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 bbaff95c3b..f171b32131 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
@@ -17,6 +17,7 @@ import io.onedev.server.entitymanager.GroupManager;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.issue.fieldspec.FieldSpec;
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.util.CommentSupport;
@@ -88,8 +89,11 @@ public class IssueFieldChangeData implements IssueChangeData {
}
@Override
- public String getDescription() {
- return "changed fields";
+ public String getActivity(Issue withIssue) {
+ String activity = "changed fields";
+ if (withIssue != null)
+ activity += " of issue " + withIssue.describe();
+ return activity;
}
public List<String> getLines(Map<String, Input> fields) {
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 b9205ce5da..49ef47863c 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
@@ -11,6 +11,7 @@ import javax.annotation.Nullable;
import org.apache.wicket.Component;
import io.onedev.server.model.Group;
+import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueChange;
import io.onedev.server.model.Milestone;
import io.onedev.server.model.User;
@@ -62,8 +63,11 @@ public class IssueMilestoneChangeData implements IssueChangeData {
}
@Override
- public String getDescription() {
- return "changed milestone";
+ public String getActivity(Issue withIssue) {
+ String activity = "changed milestone";
+ if (withIssue != null)
+ activity += " of issue " + withIssue.describe();
+ return activity;
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssuePullRequestDiscardedData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssuePullRequestDiscardedData.java
index 9ac4e9a8ca..60243b5046 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssuePullRequestDiscardedData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssuePullRequestDiscardedData.java
@@ -1,5 +1,6 @@
package io.onedev.server.model.support.issue.changedata;
+import io.onedev.server.model.Issue;
import io.onedev.server.model.PullRequest;
public class IssuePullRequestDiscardedData extends IssuePullRequestData {
@@ -11,8 +12,11 @@ public class IssuePullRequestDiscardedData extends IssuePullRequestData {
}
@Override
- public String getDescription() {
- return "discarded pull request fixing this issue";
+ public String getActivity(Issue withIssue) {
+ if (withIssue != null)
+ return "discarded pull request fixing issue " + withIssue.describe();
+ else
+ return "discarded pull request fixing this issue";
}
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssuePullRequestMergedData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssuePullRequestMergedData.java
index 623dd0c24c..2afdbcacba 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssuePullRequestMergedData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssuePullRequestMergedData.java
@@ -1,5 +1,6 @@
package io.onedev.server.model.support.issue.changedata;
+import io.onedev.server.model.Issue;
import io.onedev.server.model.PullRequest;
public class IssuePullRequestMergedData extends IssuePullRequestData {
@@ -11,8 +12,11 @@ public class IssuePullRequestMergedData extends IssuePullRequestData {
}
@Override
- public String getDescription() {
- return "merged pull request fixing this issue";
+ public String getActivity(Issue withIssue) {
+ if (withIssue != null)
+ return "merged pull request fixing issue " + withIssue.describe();
+ else
+ return "merged pull request fixing this issue";
}
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssuePullRequestOpenedData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssuePullRequestOpenedData.java
index 084ab4c433..89791bd9e8 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssuePullRequestOpenedData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssuePullRequestOpenedData.java
@@ -1,5 +1,6 @@
package io.onedev.server.model.support.issue.changedata;
+import io.onedev.server.model.Issue;
import io.onedev.server.model.PullRequest;
public class IssuePullRequestOpenedData extends IssuePullRequestData {
@@ -11,8 +12,11 @@ public class IssuePullRequestOpenedData extends IssuePullRequestData {
}
@Override
- public String getDescription() {
- return "opened pull request fixing this issue";
+ public String getActivity(Issue withIssue) {
+ if (withIssue != null)
+ return "opened pull request fixing issue " + withIssue.describe();
+ else
+ return "opened pull request fixing this issue";
}
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssuePullRequestReopenedData.java b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssuePullRequestReopenedData.java
index 95df081c2c..a16d92c8c3 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssuePullRequestReopenedData.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/changedata/IssuePullRequestReopenedData.java
@@ -1,5 +1,6 @@
package io.onedev.server.model.support.issue.changedata;
+import io.onedev.server.model.Issue;
import io.onedev.server.model.PullRequest;
public class IssuePullRequestReopenedData extends IssuePullRequestData {
@@ -11,8 +12,11 @@ public class IssuePullRequestReopenedData extends IssuePullRequestData {
}
@Override
- public String getDescription() {
- return "reopened pull request fixing this issue";
+ public String getActivity(Issue withIssue) {
+ if (withIssue != null)
+ return "reopened pull request fixing issue " + withIssue.describe();
+ else
+ return "reopened pull request fixing this issue";
}
}
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 09d551418d..518767bb96 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
@@ -8,6 +8,7 @@ import org.apache.wicket.Component;
import io.onedev.server.model.CodeComment;
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.util.CommentSupport;
@@ -28,8 +29,11 @@ public class IssueReferencedFromCodeCommentData implements IssueChangeData {
}
@Override
- public String getDescription() {
- return "Referenced from code comment";
+ public String getActivity(Issue withIssue) {
+ if (withIssue != null)
+ return "A code comment referenced issue " + withIssue.describe();
+ else
+ return "Referenced from code comment";
}
@Override
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 0d729b0cc0..eff68be1f3 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
@@ -33,8 +33,11 @@ public class IssueReferencedFromIssueData implements IssueChangeData {
}
@Override
- public String getDescription() {
- return "Referenced from other issue";
+ public String getActivity(Issue withIssue) {
+ if (withIssue != null)
+ return "Another issue referenced issue " + withIssue.describe();
+ else
+ return "Referenced from other issue";
}
@Override
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 a269148fac..4f119d6bc7 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
@@ -7,6 +7,7 @@ import java.util.Map;
import org.apache.wicket.Component;
import io.onedev.server.model.Group;
+import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueChange;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
@@ -33,8 +34,11 @@ public class IssueReferencedFromPullRequestData implements IssueChangeData {
}
@Override
- public String getDescription() {
- return "Referenced from pull request";
+ public String getActivity(Issue withIssue) {
+ if (withIssue != null)
+ return "A pull request referenced issue " + withIssue.describe();
+ else
+ return "Referenced from pull request";
}
@Override
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 f305af0c61..4b154fa152 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
@@ -7,6 +7,7 @@ import javax.annotation.Nullable;
import org.apache.wicket.Component;
+import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueChange;
import io.onedev.server.util.CommentSupport;
import io.onedev.server.util.Input;
@@ -115,8 +116,11 @@ public class IssueStateChangeData extends IssueFieldChangeData {
}
@Override
- public String getDescription() {
- return "changed state";
+ public String getActivity(Issue withIssue) {
+ String activity = "changed state to '" + newState + "'";
+ if (withIssue != null)
+ activity += " for issue " + withIssue.describe();
+ return activity;
}
}
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 be8779f2f2..ae217de814 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
@@ -9,6 +9,7 @@ import org.apache.wicket.Component;
import com.google.common.collect.Lists;
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.util.CommentSupport;
@@ -33,8 +34,11 @@ public class IssueTitleChangeData implements IssueChangeData {
}
@Override
- public String getDescription() {
- return "changed title";
+ public String getActivity(Issue withIssue) {
+ String activity = "changed title";
+ if (withIssue != null)
+ activity += " of issue " + withIssue.describe();
+ return activity;
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/ReviewResult.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/ReviewResult.java
index 6381276be4..b62780f456 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/ReviewResult.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/ReviewResult.java
@@ -10,6 +10,8 @@ public class ReviewResult implements Serializable {
private static final long serialVersionUID = 1L;
+ public static final String PROP_APPROVED = "approved";
+
private String commit;
private Boolean approved = false;
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 897ef2a7e9..28cef40e9d 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
@@ -4,6 +4,7 @@ import javax.annotation.Nullable;
import org.apache.wicket.Component;
+import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestChange;
import io.onedev.server.util.CommentSupport;
import io.onedev.server.util.diff.DiffSupport;
@@ -20,8 +21,11 @@ public class PullRequestApproveData implements PullRequestChangeData {
}
@Override
- public String getDescription() {
- return "approved";
+ public String getActivity(PullRequest withRequest) {
+ String activity = "approved";
+ if (withRequest != null)
+ activity += " pull request " + withRequest.describe();
+ return activity;
}
@Override
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 199102f5b0..2732304e03 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
@@ -6,6 +6,7 @@ import javax.annotation.Nullable;
import org.apache.wicket.Component;
+import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestChange;
import io.onedev.server.util.CommentSupport;
@@ -13,7 +14,7 @@ public interface PullRequestChangeData extends Serializable {
abstract Component render(String componentId, PullRequestChange change);
- abstract String getDescription();
+ abstract String getActivity(@Nullable PullRequest withRequest);
@Nullable
abstract CommentSupport getCommentSupport();
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 c24e5ce45e..0000000000
--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/changedata/PullRequestDescriptionChangeData.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package io.onedev.server.model.support.pullrequest.changedata;
-
-import java.util.List;
-
-import org.apache.wicket.Component;
-
-import io.onedev.commons.utils.StringUtils;
-import io.onedev.server.model.PullRequestChange;
-import io.onedev.server.util.CommentSupport;
-import io.onedev.server.web.component.diff.plain.PlainDiffPanel;
-
-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;
- }
-
- @Override
- public String getDescription() {
- return "changed description";
- }
-
- @Override
- public Component render(String componentId, PullRequestChange change) {
- List<String> oldLines = StringUtils.splitAndTrim(oldDescription, "\n");
- List<String> newLines = StringUtils.splitAndTrim(newDescription, "\n");
- return new PlainDiffPanel(componentId, oldLines, "a.txt", newLines, "b.txt", true);
- }
-
- @Override
- public CommentSupport getCommentSupport() {
- 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 2fe8c06aeb..9e14c6c28d 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
@@ -4,6 +4,7 @@ import javax.annotation.Nullable;
import org.apache.wicket.Component;
+import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestChange;
import io.onedev.server.util.CommentSupport;
import io.onedev.server.util.diff.DiffSupport;
@@ -20,8 +21,11 @@ public class PullRequestDiscardData implements PullRequestChangeData {
}
@Override
- public String getDescription() {
- return "discarded pull request";
+ public String getActivity(PullRequest withRequest) {
+ String activity = "discarded";
+ if (withRequest != null)
+ activity += " pull request " + withRequest.describe();
+ return activity;
}
@Override
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 41984942cf..858195438e 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
@@ -4,6 +4,7 @@ import javax.annotation.Nullable;
import org.apache.wicket.Component;
+import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestChange;
import io.onedev.server.util.CommentSupport;
@@ -18,11 +19,15 @@ public class PullRequestMergeData implements PullRequestChangeData {
}
@Override
- public String getDescription() {
- if (reason != null)
+ public String getActivity(PullRequest withRequest) {
+ if (reason != null) {
return reason;
- else
- return "merged pull request";
+ } else {
+ String activity = "merged";
+ if (withRequest != null)
+ activity += " pull request " + withRequest.describe();
+ return activity;
+ }
}
@Override
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 54c31a8233..dd08d5880f 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
@@ -6,6 +6,7 @@ import org.apache.wicket.Component;
import com.google.common.collect.Lists;
+import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestChange;
import io.onedev.server.model.support.pullrequest.MergeStrategy;
import io.onedev.server.util.CommentSupport;
@@ -26,8 +27,11 @@ public class PullRequestMergeStrategyChangeData implements PullRequestChangeData
}
@Override
- public String getDescription() {
- return "changed merge strategy";
+ public String getActivity(PullRequest withRequest) {
+ String activity = "changed merge strategy";
+ if (withRequest != null)
+ activity += " of pull request" + withRequest.describe();
+ return activity;
}
@Override
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 696b0eb919..6c45c30589 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
@@ -3,6 +3,7 @@ package io.onedev.server.model.support.pullrequest.changedata;
import org.apache.wicket.Component;
import io.onedev.server.model.CodeComment;
+import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestChange;
import io.onedev.server.util.CommentSupport;
import io.onedev.server.web.component.codecomment.referencedfrom.ReferencedFromCodeCommentPanel;
@@ -27,8 +28,11 @@ public class PullRequestReferencedFromCodeCommentData implements PullRequestChan
}
@Override
- public String getDescription() {
- return "referenced from code comment";
+ public String getActivity(PullRequest withRequest) {
+ if (withRequest != null)
+ return "A code comment referenced pull request " + withRequest.describe();
+ else
+ return "Referenced from code comment";
}
@Override
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 bab518b0f3..4a61d5bc4f 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
@@ -3,6 +3,7 @@ package io.onedev.server.model.support.pullrequest.changedata;
import org.apache.wicket.Component;
import io.onedev.server.model.Issue;
+import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestChange;
import io.onedev.server.util.CommentSupport;
import io.onedev.server.web.component.issue.referencedfrom.ReferencedFromIssuePanel;
@@ -27,8 +28,11 @@ public class PullRequestReferencedFromIssueData implements PullRequestChangeData
}
@Override
- public String getDescription() {
- return "Referenced from issue";
+ public String getActivity(PullRequest withRequest) {
+ if (withRequest != null)
+ return "An issue referenced pull request " + withRequest.describe();
+ else
+ return "Referenced from issue";
}
@Override
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 46e1243748..74865e2bc0 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
@@ -27,8 +27,11 @@ public class PullRequestReferencedFromPullRequestData implements PullRequestChan
}
@Override
- public String getDescription() {
- return "referenced from other pull request";
+ public String getActivity(PullRequest withRequest) {
+ if (withRequest != null)
+ return "Another pull request referenced pull request " + withRequest.describe();
+ else
+ return "Referenced from other pull request";
}
@Override
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 96afeb6de1..ce1186ce4a 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
@@ -4,6 +4,7 @@ import javax.annotation.Nullable;
import org.apache.wicket.Component;
+import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestChange;
import io.onedev.server.util.CommentSupport;
import io.onedev.server.util.diff.DiffSupport;
@@ -20,8 +21,11 @@ public class PullRequestReopenData implements PullRequestChangeData {
}
@Override
- public String getDescription() {
- return "reopened pull request";
+ public String getActivity(PullRequest withRequest) {
+ String activity = "reopened";
+ if (withRequest != null)
+ activity += " pull request " + withRequest.describe();
+ return activity;
}
@Override
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 b73fb93dea..3ba043241b 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
@@ -4,6 +4,7 @@ import javax.annotation.Nullable;
import org.apache.wicket.Component;
+import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestChange;
import io.onedev.server.util.CommentSupport;
import io.onedev.server.util.diff.DiffSupport;
@@ -20,8 +21,11 @@ public class PullRequestRequestedForChangesData implements PullRequestChangeData
}
@Override
- public String getDescription() {
- return "requested for changes";
+ public String getActivity(PullRequest withRequest) {
+ String activity = "requested for changes";
+ if (withRequest != null)
+ activity += " in pull request " + withRequest.describe();
+ return activity;
}
@Override
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 be9a747404..c0b2e7a828 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
@@ -2,6 +2,7 @@ package io.onedev.server.model.support.pullrequest.changedata;
import org.apache.wicket.Component;
+import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestChange;
import io.onedev.server.util.CommentSupport;
@@ -16,8 +17,11 @@ public class PullRequestReviewerAddData implements PullRequestChangeData {
}
@Override
- public String getDescription() {
- return "added reviewer \"" + reviewer + "\"";
+ public String getActivity(PullRequest withRequest) {
+ String activity = "added reviewer \"" + reviewer + "\"";
+ if (withRequest != null)
+ activity += " in pull request " + withRequest.describe();
+ return activity;
}
@Override
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 02d16e06ba..bc5ddc97c1 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
@@ -2,6 +2,7 @@ package io.onedev.server.model.support.pullrequest.changedata;
import org.apache.wicket.Component;
+import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestChange;
import io.onedev.server.util.CommentSupport;
@@ -16,8 +17,11 @@ public class PullRequestReviewerRemoveData implements PullRequestChangeData {
}
@Override
- public String getDescription() {
- return "removed reviewer \"" + reviewer + "\"";
+ public String getActivity(PullRequest withRequest) {
+ String activity = "removed reviewer \"" + reviewer + "\"";
+ if (withRequest != null)
+ activity += " in pull request " + withRequest.describe();
+ return activity;
}
@Override
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 e41365fab2..338cbeb904 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
@@ -4,6 +4,7 @@ import javax.annotation.Nullable;
import org.apache.wicket.Component;
+import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestChange;
import io.onedev.server.util.CommentSupport;
import io.onedev.server.util.diff.DiffSupport;
@@ -20,8 +21,11 @@ public class PullRequestSourceBranchDeleteData implements PullRequestChangeData
}
@Override
- public String getDescription() {
- return "deleted source branch";
+ public String getActivity(PullRequest withRequest) {
+ String activity = "deleted source branch";
+ if (withRequest != null)
+ activity += " of pull request " + withRequest.describe();
+ return activity;
}
@Override
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 4b9576ebc5..cc004b1a3a 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
@@ -4,6 +4,7 @@ import javax.annotation.Nullable;
import org.apache.wicket.Component;
+import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestChange;
import io.onedev.server.util.CommentSupport;
import io.onedev.server.util.diff.DiffSupport;
@@ -20,8 +21,11 @@ public class PullRequestSourceBranchRestoreData implements PullRequestChangeData
}
@Override
- public String getDescription() {
- return "restored source branch";
+ public String getActivity(PullRequest withRequest) {
+ String activity = "restored source branch";
+ if (withRequest != null)
+ activity += " of pull request " + withRequest.describe();
+ return activity;
}
@Override
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 4dba3b6995..659dcd7d9f 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
@@ -6,6 +6,7 @@ import org.apache.wicket.Component;
import com.google.common.collect.Lists;
+import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestChange;
import io.onedev.server.util.CommentSupport;
import io.onedev.server.util.diff.DiffSupport;
@@ -25,8 +26,11 @@ public class PullRequestTitleChangeData implements PullRequestChangeData {
}
@Override
- public String getDescription() {
- return "changed title";
+ public String getActivity(PullRequest withRequest) {
+ String activity = "changed title";
+ if (withRequest != null)
+ activity += " of pull request " + withRequest.describe();
+ return activity;
}
@Override
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 9b66ed3316..f7d44a1cb9 100644
--- a/server-core/src/main/java/io/onedev/server/notification/CodeCommentNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/CodeCommentNotificationManager.java
@@ -1,11 +1,10 @@
package io.onedev.server.notification;
-import java.util.Collection;
-import java.util.HashSet;
-
import javax.inject.Inject;
import javax.inject.Singleton;
+import com.google.common.collect.Sets;
+
import io.onedev.commons.launcher.loader.Listen;
import io.onedev.server.entitymanager.UrlManager;
import io.onedev.server.entitymanager.UserManager;
@@ -46,28 +45,24 @@ public class CodeCommentNotificationManager {
String markdown = markdownAware.getMarkdown();
String rendered = markdownManager.render(markdown);
- Collection<String> toList = new HashSet<>();
for (String userName: new MentionParser().parseMentions(rendered)) {
User user = userManager.findByName(userName);
- if (user != null)
- toList.add(user.getEmail());
- }
-
- if (!toList.isEmpty()) {
- String url;
- if (event instanceof CodeCommentCreated)
- url = urlManager.urlFor(((CodeCommentCreated)event).getComment(), null);
- else if (event instanceof CodeCommentReplied)
- url = urlManager.urlFor(((CodeCommentReplied)event).getReply(), null);
- else
- url = null;
-
- if (url != null) {
- String subject = String.format("You are mentioned in a code comment on file '%s'",
- event.getComment().getMarkPos().getPath());
- String body = String.format("Visit <a href='%s'>%s</a> for details", url, url);
+ if (user != null) {
+ String url;
+ if (event instanceof CodeCommentCreated)
+ url = urlManager.urlFor(((CodeCommentCreated)event).getComment(), null);
+ else if (event instanceof CodeCommentReplied)
+ url = urlManager.urlFor(((CodeCommentReplied)event).getReply(), null);
+ else
+ url = null;
- mailManager.sendMailAsync(toList, subject, body);
+ if (url != null) {
+ String subject = String.format("You are mentioned in a code comment on file '%s'",
+ event.getComment().getMarkPos().getPath());
+ String body = String.format("Visit <a href='%s'>%s</a> for details", url, url);
+
+ mailManager.sendMailAsync(Sets.newHashSet(user.getEmail()), subject, body);
+ }
}
}
}
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 b22b792ade..0200665b87 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
@@ -10,6 +10,8 @@ import java.util.stream.Collectors;
import javax.inject.Inject;
import javax.inject.Singleton;
+import com.google.common.collect.Sets;
+
import io.onedev.commons.launcher.loader.Listen;
import io.onedev.server.entitymanager.IssueWatchManager;
import io.onedev.server.entitymanager.SettingManager;
@@ -27,6 +29,10 @@ 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.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;
@@ -93,7 +99,7 @@ public class IssueNotificationManager {
}
}.getWatches().entrySet()) {
- watch(issue, entry.getKey(), entry.getValue());
+ issueWatchManager.watch(issue, entry.getKey(), entry.getValue());
}
for (Map.Entry<User, Boolean> entry: new QueryWatchBuilder<Issue>() {
@@ -119,96 +125,118 @@ public class IssueNotificationManager {
}
}.getWatches().entrySet()) {
- watch(issue, entry.getKey(), entry.getValue());
+ issueWatchManager.watch(issue, entry.getKey(), entry.getValue());
+ }
+
+ Collection<User> notifiedUsers = Sets.newHashSet();
+ if (user != null) {
+ notifiedUsers.add(user); // no need to notify the user generating the event
+ if (!user.isSystem())
+ issueWatchManager.watch(issue, user, true);
}
- if (user != null && !user.isSystem())
- watch(issue, user, true);
+ Map<String, Group> newGroups = event.getNewGroups();
+ Map<String, Collection<User>> newUsers = event.getNewUsers();
+
+ String url = urlManager.urlFor(issue);
+ for (Map.Entry<String, Group> entry: newGroups.entrySet()) {
+ String subject = String.format("You are now \"%s\" of issue %s", entry.getKey(), issue.describe());
+ String body = String.format("Visit <a href='%s'>%s</a> for details", url, url);
+ Set<String> emails = entry.getValue().getMembers()
+ .stream()
+ .map(it->it.getEmail())
+ .collect(Collectors.toSet());
+ mailManager.sendMailAsync(emails, subject, body.toString());
+
+ for (User member: entry.getValue().getMembers()) {
+ userInfoManager.setIssueNotified(member, issue, true);
+ issueWatchManager.watch(issue, member, true);
+ }
+ notifiedUsers.addAll(entry.getValue().getMembers());
+ }
+ for (Map.Entry<String, Collection<User>> entry: newUsers.entrySet()) {
+ String subject = String.format("You are now \"%s\" of issue %s", entry.getKey(), issue.describe());
+ String body = String.format("Visit <a href='%s'>%s</a> for details", url, url);
+ Set<String> emails = entry.getValue()
+ .stream()
+ .map(it->it.getEmail())
+ .collect(Collectors.toSet());
+ mailManager.sendMailAsync(emails, subject, body.toString());
+
+ for (User each: entry.getValue()) {
+ issueWatchManager.watch(issue, each, true);
+ userInfoManager.setIssueNotified(each, issue, true);
+ }
+ notifiedUsers.addAll(entry.getValue());
+ }
- Collection<User> notifiedUsers = new HashSet<>();
if (event instanceof MarkdownAware) {
MarkdownAware markdownAware = (MarkdownAware) event;
String markdown = markdownAware.getMarkdown();
if (markdown != null) {
String rendered = markdownManager.render(markdown);
- Collection<User> mentionUsers = new HashSet<>();
for (String userName: new MentionParser().parseMentions(rendered)) {
- User mentionUser = userManager.findByName(userName);
- if (mentionUser != null)
- mentionUsers.add(mentionUser);
- }
-
- if (!mentionUsers.isEmpty()) {
- for (User mentionedUser: mentionUsers)
- watch(issue, mentionedUser, true);
-
- String url;
- if (event instanceof IssueOpened)
- url = urlManager.urlFor(((IssueOpened)event).getIssue());
- else if (event instanceof IssueCommented)
- url = urlManager.urlFor(((IssueCommented)event).getComment());
- else if (event instanceof IssueChangeEvent)
- url = urlManager.urlFor(((IssueChangeEvent)event).getChange());
- else
- url = urlManager.urlFor(event.getIssue());
-
- String subject = String.format("You are mentioned in issue #%d - %s",
- issue.getNumber(), issue.getTitle());
- String body = String.format("Visit <a href='%s'>%s</a> for details", url, url);
-
- mailManager.sendMailAsync(mentionUsers.stream().map(User::getEmail).collect(Collectors.toList()),
- subject, body);
- notifiedUsers.addAll(mentionUsers);
+ User mentionedUser = userManager.findByName(userName);
+ if (mentionedUser != null && !notifiedUsers.contains(mentionedUser)) {
+ if (event instanceof IssueOpened)
+ url = urlManager.urlFor(((IssueOpened)event).getIssue());
+ else if (event instanceof IssueCommented)
+ url = urlManager.urlFor(((IssueCommented)event).getComment());
+ else if (event instanceof IssueChangeEvent)
+ url = urlManager.urlFor(((IssueChangeEvent)event).getChange());
+ else
+ url = urlManager.urlFor(event.getIssue());
+
+ String subject = String.format("You are mentioned in issue %s", issue.describe());
+ String body = String.format("Visit <a href='%s'>%s</a> for details", url, url);
+
+ mailManager.sendMailAsync(Sets.newHashSet(mentionedUser.getEmail()), subject, body);
+
+ issueWatchManager.watch(issue, mentionedUser, true);
+ userInfoManager.setIssueNotified(mentionedUser, issue, true);
+ notifiedUsers.add(mentionedUser);
+ }
}
}
}
-
- Map<String, Group> newGroups = event.getNewGroups();
- Map<String, Collection<User>> newUsers = event.getNewUsers();
- for (Group group: newGroups.values()) {
- for (User member: group.getMembers())
- watch(issue, member, true);
- }
- String url = urlManager.urlFor(issue);
- for (Map.Entry<String, Collection<User>> entry: newUsers.entrySet()) {
- String subject = String.format("You are now \"%s\" of issue #%d: %s",
- entry.getKey(), issue.getNumber(), issue.getTitle());
- String body = String.format("Visit <a href='%s'>%s</a> for details", url, url);
- Set<String> emails = entry.getValue().stream().map(it->it.getEmail()).collect(Collectors.toSet());
- mailManager.sendMailAsync(emails, subject, body.toString());
- notifiedUsers.addAll(entry.getValue());
+ boolean notifyWatchers = false;
+ if (event instanceof IssueChangeEvent) {
+ IssueChangeData changeData = ((IssueChangeEvent) event).getChange().getData();
+ if (!(changeData instanceof IssueReferencedFromCodeCommentData
+ || changeData instanceof IssueReferencedFromIssueData
+ || changeData instanceof IssueReferencedFromPullRequestData)) {
+ notifyWatchers = true;
+ }
+ } else {
+ notifyWatchers = true;
}
-
- Collection<User> usersToNotify = new HashSet<>();
- for (IssueWatch watch: issue.getWatches()) {
- Date visitDate = userInfoManager.getIssueVisitDate(watch.getUser(), issue);
- if (watch.isWatching()
- && !userInfoManager.isNotified(watch.getUser(), watch.getIssue())
- && !watch.getUser().equals(event.getUser())
- && (visitDate == null || visitDate.getTime()<event.getDate().getTime())
- && !notifiedUsers.contains(watch.getUser())) {
- usersToNotify.add(watch.getUser());
- userInfoManager.setIssueNotified(watch.getUser(), watch.getIssue(), true);
- issueWatchManager.save(watch);
+ if (notifyWatchers) {
+ Collection<User> usersToNotify = new HashSet<>();
+
+ for (IssueWatch watch: issue.getWatches()) {
+ Date visitDate = userInfoManager.getIssueVisitDate(watch.getUser(), issue);
+ if (watch.isWatching()
+ && !userInfoManager.isNotified(watch.getUser(), watch.getIssue())
+ && (visitDate == null || visitDate.before(event.getDate()))
+ && !notifiedUsers.contains(watch.getUser())) {
+ usersToNotify.add(watch.getUser());
+ userInfoManager.setIssueNotified(watch.getUser(), watch.getIssue(), true);
+ }
}
- }
- if (!usersToNotify.isEmpty()) {
- String subject = String.format("New activities in issue #%d - %s", issue.getNumber(), issue.getTitle());
- String body = String.format("Visit <a href='%s'>%s</a> for details", url, url);
- mailManager.sendMailAsync(usersToNotify.stream().map(User::getEmail).collect(Collectors.toList()), subject, body);
- }
- }
-
- private void watch(Issue issue, User user, boolean watching) {
- IssueWatch watch = (IssueWatch) issue.getWatch(user, true);
- if (watch.isNew()) {
- watch.setWatching(watching);
- issueWatchManager.save(watch);
+ if (!usersToNotify.isEmpty()) {
+ String subject;
+ if (user != null)
+ subject = String.format("%s %s", user.getDisplayName(), event.getActivity(true));
+ else
+ subject = event.getActivity(true);
+ String body = String.format("Visit <a href='%s'>%s</a> for details", url, url);
+ mailManager.sendMailAsync(usersToNotify.stream().map(User::getEmail).collect(Collectors.toList()), subject, body);
+ }
}
}
-
+
}
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 f976987ae4..3a000af2c6 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
@@ -1,6 +1,5 @@
package io.onedev.server.notification;
-import java.io.Serializable;
import java.util.Collection;
import java.util.Date;
import java.util.HashSet;
@@ -10,10 +9,8 @@ import java.util.stream.Collectors;
import javax.inject.Inject;
import javax.inject.Singleton;
-import org.hibernate.CallbackException;
-import org.hibernate.type.Type;
-
import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
import io.onedev.commons.launcher.loader.Listen;
import io.onedev.server.entitymanager.PullRequestWatchManager;
@@ -21,6 +18,7 @@ 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;
import io.onedev.server.event.pullrequest.PullRequestCodeCommentCreated;
@@ -29,9 +27,9 @@ import io.onedev.server.event.pullrequest.PullRequestCodeCommentReplied;
import io.onedev.server.event.pullrequest.PullRequestCommentCreated;
import io.onedev.server.event.pullrequest.PullRequestEvent;
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.model.Build;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestReview;
import io.onedev.server.model.PullRequestWatch;
@@ -44,7 +42,6 @@ import io.onedev.server.model.support.pullrequest.changedata.PullRequestDiscardD
import io.onedev.server.model.support.pullrequest.changedata.PullRequestMergeData;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestReopenData;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestRequestedForChangesData;
-import io.onedev.server.persistence.PersistListener;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.QueryWatchBuilder;
@@ -53,7 +50,7 @@ import io.onedev.server.util.markdown.MarkdownManager;
import io.onedev.server.util.markdown.MentionParser;
@Singleton
-public class PullRequestNotificationManager implements PersistListener {
+public class PullRequestNotificationManager {
private final MailManager mailManager;
@@ -111,7 +108,7 @@ public class PullRequestNotificationManager implements PersistListener {
}
}.getWatches().entrySet()) {
- watch(request, entry.getKey(), entry.getValue());
+ pullRequestWatchManager.watch(request, entry.getKey(), entry.getValue());
}
for (Map.Entry<User, Boolean> entry: new QueryWatchBuilder<PullRequest>() {
@@ -137,98 +134,88 @@ public class PullRequestNotificationManager implements PersistListener {
}
}.getWatches().entrySet()) {
- watch(request, entry.getKey(), entry.getValue());
+ pullRequestWatchManager.watch(request, entry.getKey(), entry.getValue());
}
- if (user != null && !user.isSystem())
- watch(request, user, true);
+ Collection<User> notifiedUsers = Sets.newHashSet();
+ if (user != null) {
+ notifiedUsers.add(user); // no need to notify the user generating the event
+ if (!user.isSystem())
+ pullRequestWatchManager.watch(request, user, true);
+ }
- Collection<User> notifiedUsers = new HashSet<>();
- if (event instanceof MarkdownAware && (!(event instanceof PullRequestCodeCommentEvent) || !((PullRequestCodeCommentEvent)event).isDerived())) {
- MarkdownAware markdownAware = (MarkdownAware) event;
- String markdown = markdownAware.getMarkdown();
- if (markdown != null) {
- String rendered = markdownManager.render(markdown);
-
- Collection<User> mentionUsers = new HashSet<>();
- for (String userName: new MentionParser().parseMentions(rendered)) {
- User mentionUser = userManager.findByName(userName);
- if (mentionUser != null)
- mentionUsers.add(mentionUser);
- }
-
- if (!mentionUsers.isEmpty()) {
- for (User mentionedUser: mentionUsers)
- watch(request, mentionedUser, true);
-
- String url;
- if (event instanceof PullRequestCommentCreated)
- url = urlManager.urlFor(((PullRequestCommentCreated)event).getComment());
- else if (event instanceof PullRequestChangeEvent)
- url = urlManager.urlFor(((PullRequestChangeEvent)event).getChange());
- else if (event instanceof PullRequestCodeCommentCreated)
- url = urlManager.urlFor(((PullRequestCodeCommentCreated)event).getComment(), request);
- else if (event instanceof PullRequestCodeCommentReplied)
- url = urlManager.urlFor(((PullRequestCodeCommentReplied)event).getReply(), request);
- else
- url = urlManager.urlFor(request);
-
- String subject = String.format("You are mentioned in pull request #%d - %s",
- request.getNumber(), request.getTitle());
- String body = String.format("Visit <a href='%s'>%s</a> for details", url, url);
-
- mailManager.sendMailAsync(mentionUsers.stream().map(User::getEmail).collect(Collectors.toList()),
- subject, body);
- notifiedUsers.addAll(mentionUsers);
+ if (event instanceof PullRequestOpened) {
+ for (PullRequestReview review: request.getReviews()) {
+ if (review.getExcludeDate() == null && review.getResult() == null) {
+ // reviewers will be sent review invitation separately
+ notifiedUsers.add(review.getUser());
}
}
- }
+ }
- if (event instanceof PullRequestChangeEvent) {
+ if (event instanceof PullRequestChangeEvent
+ && request.getSubmitter() != null
+ && !notifiedUsers.contains(request.getSubmitter())) {
PullRequestChangeEvent actionEvent = (PullRequestChangeEvent) event;
PullRequestChangeData actionData = actionEvent.getChange().getData();
String subject = null;
- if (actionData instanceof PullRequestApproveData) {
- subject = String.format(user.getDisplayName() + " approved pull request #%d - %s",
- request.getNumber(), request.getTitle());
- } else if (actionData instanceof PullRequestRequestedForChangesData) {
- subject = String.format(user.getDisplayName() + " requested changes for pull request #%d - %s",
- request.getNumber(), request.getTitle());
- }
- if (request.getSubmitter() != null && subject != null) {
- String url = urlManager.urlFor(request);
- String body = String.format("Visit <a href='%s'>%s</a> for details", url, url);
- mailManager.sendMailAsync(Lists.newArrayList(request.getSubmitter().getEmail()), subject, body);
- notifiedUsers.add(request.getSubmitter());
- }
- } else if (event instanceof PullRequestMergePreviewCalculated && request.getMergePreview() != null
- && request.getMergePreview().getMerged() == null) {
- String subject = String.format("Merge conflicts in pull request #%d - %s",
- request.getNumber(), request.getTitle());
- String url = urlManager.urlFor(request);
- String body = String.format("Visit <a href='%s'>%s</a> for details", url, url);
- mailManager.sendMailAsync(Lists.newArrayList(request.getSubmitter().getEmail()), subject, body);
- notifiedUsers.add(request.getSubmitter());
- } else if (event instanceof PullRequestBuildEvent) {
- Build build = ((PullRequestBuildEvent) event).getPullRequestBuild().getBuild();
- if (build.getStatus() == Build.Status.FAILED
- || build.getStatus() == Build.Status.CANCELLED
- || build.getStatus() == Build.Status.TIMED_OUT) {
- String subject = String.format("Failed to build pull request #%d - %s",
- request.getNumber(), request.getTitle());
+ if (actionData instanceof PullRequestApproveData)
+ subject = String.format(user.getDisplayName() + " approved pull request %s", request.describe());
+ else if (actionData instanceof PullRequestRequestedForChangesData)
+ subject = String.format(user.getDisplayName() + " requested changes for pull request %s", request.describe());
+ else if (actionData instanceof PullRequestDiscardData)
+ subject = String.format(user.getDisplayName() + " discarded pull request %s", request.describe());
+ if (subject != null) {
String url = urlManager.urlFor(request);
String body = String.format("Visit <a href='%s'>%s</a> for details", url, url);
mailManager.sendMailAsync(Lists.newArrayList(request.getSubmitter().getEmail()), subject, body);
+ userInfoManager.setPullRequestNotified(request.getSubmitter(), request, true);
notifiedUsers.add(request.getSubmitter());
}
}
+ if (event instanceof MarkdownAware && (!(event instanceof PullRequestCodeCommentEvent) || !((PullRequestCodeCommentEvent)event).isDerived())) {
+ 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.contains(mentionedUser)) {
+ pullRequestWatchManager.watch(request, mentionedUser, true);
+ String url;
+ if (event instanceof PullRequestCommentCreated)
+ url = urlManager.urlFor(((PullRequestCommentCreated)event).getComment());
+ else if (event instanceof PullRequestChangeEvent)
+ url = urlManager.urlFor(((PullRequestChangeEvent)event).getChange());
+ else if (event instanceof PullRequestCodeCommentCreated)
+ url = urlManager.urlFor(((PullRequestCodeCommentCreated)event).getComment(), request);
+ else if (event instanceof PullRequestCodeCommentReplied)
+ url = urlManager.urlFor(((PullRequestCodeCommentReplied)event).getReply(), request);
+ else
+ url = urlManager.urlFor(request);
+
+ String subject = String.format("You are mentioned in pull request %s", request.describe());
+ String body = String.format("Visit <a href='%s'>%s</a> for details", url, url);
+
+ mailManager.sendMailAsync(Sets.newHashSet(mentionedUser.getEmail()), subject, body);
+ userInfoManager.setPullRequestNotified(mentionedUser, request, true);
+
+ notifiedUsers.add(mentionedUser);
+ }
+ }
+ }
+ }
+
boolean notifyWatchers = false;
if (event instanceof PullRequestChangeEvent) {
- PullRequestChangeData actionData = ((PullRequestChangeEvent) event).getChange().getData();
- if (actionData instanceof PullRequestApproveData || actionData instanceof PullRequestRequestedForChangesData
- || actionData instanceof PullRequestMergeData || actionData instanceof PullRequestDiscardData
- || actionData instanceof PullRequestReopenData) {
+ PullRequestChangeData changeData = ((PullRequestChangeEvent) event).getChange().getData();
+ if (changeData instanceof PullRequestApproveData
+ || changeData instanceof PullRequestRequestedForChangesData
+ || changeData instanceof PullRequestMergeData
+ || changeData instanceof PullRequestDiscardData
+ || changeData instanceof PullRequestReopenData) {
notifyWatchers = true;
}
} else if (!(event instanceof PullRequestMergePreviewCalculated || event instanceof PullRequestBuildEvent)) {
@@ -242,83 +229,49 @@ public class PullRequestNotificationManager implements PersistListener {
Date visitDate = userInfoManager.getPullRequestVisitDate(watch.getUser(), request);
if (watch.isWatching()
&& !userInfoManager.isNotified(watch.getUser(), watch.getRequest())
- && !watch.getUser().equals(event.getUser())
- && (visitDate == null || visitDate.getTime()<event.getDate().getTime())
+ && (visitDate == null || visitDate.before(event.getDate()))
&& (!(event instanceof PullRequestUpdated) || !watch.getUser().equals(request.getSubmitter()))
&& !notifiedUsers.contains(watch.getUser())) {
usersToNotify.add(watch.getUser());
userInfoManager.setPullRequestNotified(watch.getUser(), watch.getRequest(), true);
- pullRequestWatchManager.save(watch);
}
}
if (!usersToNotify.isEmpty()) {
String url = urlManager.urlFor(request);
- String subject = String.format("New activities in pull request #%d - %s", request.getNumber(), request.getTitle());
+ String subject;
+ if (user != null)
+ subject = String.format("%s %s", user.getDisplayName(), event.getActivity(true));
+ else
+ subject = event.getActivity(true);
String body = String.format("Visit <a href='%s'>%s</a> for details", url, url);
mailManager.sendMailAsync(usersToNotify.stream().map(User::getEmail).collect(Collectors.toList()), subject, body);
}
}
}
- @Override
- public boolean onLoad(Object entity, Serializable id, Object[] state, String[] propertyNames, Type[] types)
- throws CallbackException {
- return false;
- }
-
- @Transactional
- @Override
- public boolean onFlushDirty(Object entity, Serializable id, Object[] currentState, Object[] previousState,
- String[] propertyNames, Type[] types) throws CallbackException {
- if (entity instanceof PullRequestReview) {
- PullRequestReview review = (PullRequestReview) entity;
- if (review.getExcludeDate() == null && review.getResult() == null) {
- for (int i=0; i<propertyNames.length; i++) {
- if (propertyNames[i].equals(PullRequestReview.PROP_RESULT) && previousState[i] != null) {
- inviteToReview(review);
- break;
- }
- }
- }
- }
- return false;
- }
-
- private void watch(PullRequest request, User user, boolean watching) {
- PullRequestWatch watch = (PullRequestWatch) request.getWatch(user, true);
- if (watch.isNew()) {
- watch.setWatching(watching);
- pullRequestWatchManager.save(watch);
- }
- }
-
private void inviteToReview(PullRequestReview review) {
PullRequest request = review.getRequest();
- watch(request, review.getUser(), true);
String url = urlManager.urlFor(request);
- String subject = String.format("You are invited to review pull request #%d - %s",
- request.getNumber(), request.getTitle());
+ String subject = String.format("You are invited to review pull request %s", request.describe());
String body = String.format("Visit <a href='%s'>%s</a> for details", url, url);
-
mailManager.sendMailAsync(Lists.newArrayList(review.getUser().getEmail()), subject, body);
+ userInfoManager.setPullRequestNotified(review.getUser(), review.getRequest(), true);
}
@Transactional
- @Override
- public boolean onSave(Object entity, Serializable id, Object[] state, String[] propertyNames, Type[] types)
- throws CallbackException {
- if (entity instanceof PullRequestReview) {
- PullRequestReview review = (PullRequestReview) entity;
- if (review.getExcludeDate() == null && review.getResult() == null)
+ @Listen
+ public void on(EntityPersisted event) {
+ if (event.isNew() && event.getEntity() instanceof PullRequestReview) {
+ PullRequestReview review = (PullRequestReview) event.getEntity();
+ PullRequest request = review.getRequest();
+ if (review.getExcludeDate() == null
+ && review.getResult() == null
+ && (request.getSubmitter() == null || !request.getSubmitter().equals(review.getUser()))) {
+ pullRequestWatchManager.watch(request, review.getUser(), true);
inviteToReview(review);
+ }
}
- return false;
- }
-
- @Override
- public void onDelete(Object entity, Serializable id, Object[] state, String[] propertyNames, Type[] types)
- throws CallbackException {
}
-}
+}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/UpdateDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/UpdateDateCriteria.java
index d5a63f30f1..9fb1537f1c 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/UpdateDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/UpdateDateCriteria.java
@@ -8,7 +8,7 @@ import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import io.onedev.server.model.CodeComment;
-
+import io.onedev.server.model.support.LastUpdate;
import io.onedev.server.search.entity.EntityCriteria;
public class UpdateDateCriteria extends EntityCriteria<CodeComment> {
@@ -29,7 +29,7 @@ public class UpdateDateCriteria extends EntityCriteria<CodeComment> {
@Override
public Predicate getPredicate(Root<CodeComment> root, CriteriaBuilder builder) {
- Path<Date> attribute = CodeCommentQuery.getPath(root, CodeComment.PROP_UPDATE_DATE);
+ Path<Date> attribute = CodeCommentQuery.getPath(root, CodeComment.PROP_LAST_UPDATE + "." + LastUpdate.PROP_DATE);
if (operator == CodeCommentQueryLexer.IsBefore)
return builder.lessThan(attribute, value);
else
@@ -39,9 +39,9 @@ public class UpdateDateCriteria extends EntityCriteria<CodeComment> {
@Override
public boolean matches(CodeComment comment) {
if (operator == CodeCommentQueryLexer.IsBefore)
- return comment.getUpdateDate().before(value);
+ return comment.getLastUpdate().getDate().before(value);
else
- return comment.getUpdateDate().after(value);
+ return comment.getLastUpdate().getDate().after(value);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/UpdateDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/UpdateDateCriteria.java
index 67ddadec09..cabdc3f0e0 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/UpdateDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/UpdateDateCriteria.java
@@ -8,7 +8,7 @@ import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import io.onedev.server.model.Issue;
-
+import io.onedev.server.model.support.LastUpdate;
import io.onedev.server.search.entity.EntityQuery;
public class UpdateDateCriteria extends IssueCriteria {
@@ -29,7 +29,7 @@ public class UpdateDateCriteria extends IssueCriteria {
@Override
public Predicate getPredicate(Root<Issue> root, CriteriaBuilder builder) {
- Path<Date> attribute = IssueQuery.getPath(root, Issue.PROP_UPDATE_DATE);
+ Path<Date> attribute = IssueQuery.getPath(root, Issue.PROP_LAST_UPDATE + "." + LastUpdate.PROP_DATE);
if (operator == IssueQueryLexer.IsBefore)
return builder.lessThan(attribute, date);
else
@@ -39,9 +39,9 @@ public class UpdateDateCriteria extends IssueCriteria {
@Override
public boolean matches(Issue issue) {
if (operator == IssueQueryLexer.IsBefore)
- return issue.getUpdateDate().before(date);
+ return issue.getLastUpdate().getDate().before(date);
else
- return issue.getUpdateDate().after(date);
+ return issue.getLastUpdate().getDate().after(date);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByCriteria.java
index becaf23693..91b2c7208a 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByCriteria.java
@@ -10,6 +10,7 @@ import javax.persistence.criteria.Root;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestReview;
import io.onedev.server.model.User;
+import io.onedev.server.model.support.pullrequest.ReviewResult;
import io.onedev.server.search.entity.EntityCriteria;
import io.onedev.server.search.entity.EntityQuery;
@@ -31,7 +32,7 @@ public class ApprovedByCriteria extends EntityCriteria<PullRequest> {
Join<?, ?> join = root.join(PullRequest.PROP_REVIEWS, JoinType.LEFT);
Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.PROP_USER);
Path<?> excludeDatePath = EntityQuery.getPath(join, PullRequestReview.PROP_EXCLUDE_DATE);
- Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.PROP_RESULT_APPROVED);
+ Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.PROP_RESULT + "." + ReviewResult.PROP_APPROVED);
join.on(builder.and(
builder.equal(userPath, user),
builder.isNull(excludeDatePath),
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java
index a47df77cf3..80a37f3983 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java
@@ -11,6 +11,7 @@ import io.onedev.server.OneException;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestReview;
import io.onedev.server.model.User;
+import io.onedev.server.model.support.pullrequest.ReviewResult;
import io.onedev.server.search.entity.EntityCriteria;
import io.onedev.server.search.entity.EntityQuery;
@@ -24,7 +25,7 @@ public class ApprovedByMeCriteria extends EntityCriteria<PullRequest> {
Join<?, ?> join = root.join(PullRequest.PROP_REVIEWS, JoinType.LEFT);
Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.PROP_USER);
Path<?> excludeDatePath = EntityQuery.getPath(join, PullRequestReview.PROP_EXCLUDE_DATE);
- Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.PROP_RESULT_APPROVED);
+ Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.PROP_RESULT + "." + ReviewResult.PROP_APPROVED);
join.on(builder.and(
builder.equal(userPath, User.get()),
builder.isNull(excludeDatePath),
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingReviewsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingReviewsCriteria.java
index c799755feb..b75d56d81e 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingReviewsCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/HasPendingReviewsCriteria.java
@@ -9,6 +9,7 @@ import javax.persistence.criteria.Root;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestReview;
+import io.onedev.server.model.support.pullrequest.ReviewResult;
import io.onedev.server.search.entity.EntityCriteria;
import io.onedev.server.search.entity.EntityQuery;
@@ -21,7 +22,7 @@ public class HasPendingReviewsCriteria extends EntityCriteria<PullRequest> {
Join<?, ?> join = root.join(PullRequest.PROP_REVIEWS, JoinType.LEFT);
Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.PROP_USER);
Path<?> excludeDatePath = EntityQuery.getPath(join, PullRequestReview.PROP_EXCLUDE_DATE);
- Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.PROP_RESULT_APPROVED);
+ Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.PROP_RESULT + "." + ReviewResult.PROP_APPROVED);
join.on(builder.and(
builder.isNotNull(userPath),
builder.isNull(excludeDatePath),
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByCriteria.java
index b202e54f80..ecc9832e3b 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByCriteria.java
@@ -10,6 +10,7 @@ import javax.persistence.criteria.Root;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestReview;
import io.onedev.server.model.User;
+import io.onedev.server.model.support.pullrequest.ReviewResult;
import io.onedev.server.search.entity.EntityCriteria;
import io.onedev.server.search.entity.EntityQuery;
@@ -31,7 +32,7 @@ public class RequestedForChangesByCriteria extends EntityCriteria<PullRequest> {
Join<?, ?> join = root.join(PullRequest.PROP_REVIEWS, JoinType.LEFT);
Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.PROP_USER);
Path<?> excludeDatePath = EntityQuery.getPath(join, PullRequestReview.PROP_EXCLUDE_DATE);
- Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.PROP_RESULT_APPROVED);
+ Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.PROP_RESULT + "." + ReviewResult.PROP_APPROVED);
join.on(builder.and(
builder.equal(userPath, this.user),
builder.isNull(excludeDatePath),
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.java
index dc00697b68..7ec8cd61a7 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.java
@@ -11,6 +11,7 @@ import io.onedev.server.OneException;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestReview;
import io.onedev.server.model.User;
+import io.onedev.server.model.support.pullrequest.ReviewResult;
import io.onedev.server.search.entity.EntityCriteria;
import io.onedev.server.search.entity.EntityQuery;
@@ -24,7 +25,7 @@ public class RequestedForChangesByMeCriteria extends EntityCriteria<PullRequest>
Join<?, ?> join = root.join(PullRequest.PROP_REVIEWS, JoinType.LEFT);
Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.PROP_USER);
Path<?> excludeDatePath = EntityQuery.getPath(join, PullRequestReview.PROP_EXCLUDE_DATE);
- Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.PROP_RESULT_APPROVED);
+ Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.PROP_RESULT + "." + ReviewResult.PROP_APPROVED);
join.on(builder.and(
builder.equal(userPath, User.get()),
builder.isNull(excludeDatePath),
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SomeoneRequestedForChangesCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SomeoneRequestedForChangesCriteria.java
index 2216af28a3..ba0a37d4fc 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SomeoneRequestedForChangesCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SomeoneRequestedForChangesCriteria.java
@@ -9,6 +9,7 @@ import javax.persistence.criteria.Root;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestReview;
+import io.onedev.server.model.support.pullrequest.ReviewResult;
import io.onedev.server.search.entity.EntityCriteria;
import io.onedev.server.search.entity.EntityQuery;
@@ -21,7 +22,7 @@ public class SomeoneRequestedForChangesCriteria extends EntityCriteria<PullReque
Join<?, ?> join = root.join(PullRequest.PROP_REVIEWS, JoinType.LEFT);
Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.PROP_USER);
Path<?> excludeDatePath = EntityQuery.getPath(join, PullRequestReview.PROP_EXCLUDE_DATE);
- Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.PROP_RESULT_APPROVED);
+ Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.PROP_RESULT + "." + ReviewResult.PROP_APPROVED);
join.on(builder.and(
builder.isNotNull(userPath),
builder.isNull(excludeDatePath),
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByCriteria.java
index 123f3ae56f..bd1b57d5e7 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByCriteria.java
@@ -10,6 +10,7 @@ import javax.persistence.criteria.Root;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestReview;
import io.onedev.server.model.User;
+import io.onedev.server.model.support.pullrequest.ReviewResult;
import io.onedev.server.search.entity.EntityCriteria;
import io.onedev.server.search.entity.EntityQuery;
@@ -31,7 +32,7 @@ public class ToBeReviewedByCriteria extends EntityCriteria<PullRequest> {
Join<?, ?> join = root.join(PullRequest.PROP_REVIEWS, JoinType.LEFT);
Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.PROP_USER);
Path<?> excludeDatePath = EntityQuery.getPath(join, PullRequestReview.PROP_EXCLUDE_DATE);
- Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.PROP_RESULT_APPROVED);
+ Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.PROP_RESULT + "." + ReviewResult.PROP_APPROVED);
join.on(builder.and(
builder.equal(userPath, user),
builder.isNull(excludeDatePath),
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java
index e7cf66ade9..80b047eda7 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java
@@ -11,6 +11,7 @@ import io.onedev.server.OneException;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequestReview;
import io.onedev.server.model.User;
+import io.onedev.server.model.support.pullrequest.ReviewResult;
import io.onedev.server.search.entity.EntityCriteria;
import io.onedev.server.search.entity.EntityQuery;
@@ -24,7 +25,7 @@ public class ToBeReviewedByMeCriteria extends EntityCriteria<PullRequest> {
Join<?, ?> join = root.join(PullRequest.PROP_REVIEWS, JoinType.LEFT);
Path<?> userPath = EntityQuery.getPath(join, PullRequestReview.PROP_USER);
Path<?> excludeDatePath = EntityQuery.getPath(join, PullRequestReview.PROP_EXCLUDE_DATE);
- Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.PROP_RESULT_APPROVED);
+ Path<?> approvedPath = EntityQuery.getPath(join, PullRequestReview.PROP_RESULT + "." + ReviewResult.PROP_APPROVED);
join.on(builder.and(
builder.equal(userPath, User.get()),
builder.isNull(excludeDatePath),
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/UpdateDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/UpdateDateCriteria.java
index 65a89004bc..dda21ef95a 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/UpdateDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/UpdateDateCriteria.java
@@ -8,6 +8,7 @@ import javax.persistence.criteria.Predicate;
import javax.persistence.criteria.Root;
import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.support.LastUpdate;
import io.onedev.server.search.entity.EntityCriteria;
import io.onedev.server.search.entity.EntityQuery;
@@ -29,7 +30,7 @@ public class UpdateDateCriteria extends EntityCriteria<PullRequest> {
@Override
public Predicate getPredicate(Root<PullRequest> root, CriteriaBuilder builder) {
- Path<Date> attribute = PullRequestQuery.getPath(root, PullRequest.PROP_UPDATE_DATE);
+ Path<Date> attribute = PullRequestQuery.getPath(root, PullRequest.PROP_LAST_UPDATE + "." + LastUpdate.PROP_DATE);
if (operator == PullRequestQueryLexer.IsBefore)
return builder.lessThan(attribute, date);
else
@@ -39,9 +40,9 @@ public class UpdateDateCriteria extends EntityCriteria<PullRequest> {
@Override
public boolean matches(PullRequest request) {
if (operator == PullRequestQueryLexer.IsBefore)
- return request.getUpdateDate().before(date);
+ return request.getLastUpdate().getDate().before(date);
else
- return request.getUpdateDate().after(date);
+ return request.getLastUpdate().getDate().after(date);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/util/markdown/EntityReferenceManager.java b/server-core/src/main/java/io/onedev/server/util/markdown/EntityReferenceManager.java
index 5df5b6527d..22717cc83c 100644
--- a/server-core/src/main/java/io/onedev/server/util/markdown/EntityReferenceManager.java
+++ b/server-core/src/main/java/io/onedev/server/util/markdown/EntityReferenceManager.java
@@ -29,9 +29,7 @@ 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;
@@ -264,8 +262,6 @@ public class EntityReferenceManager {
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
@@ -280,8 +276,6 @@ public class EntityReferenceManager {
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
diff --git a/server-core/src/main/java/io/onedev/server/util/validation/UserNameValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/UserNameValidator.java
index ee80550e1c..95ad38eefd 100644
--- a/server-core/src/main/java/io/onedev/server/util/validation/UserNameValidator.java
+++ b/server-core/src/main/java/io/onedev/server/util/validation/UserNameValidator.java
@@ -7,6 +7,7 @@ import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import io.onedev.commons.utils.StringUtils;
+import io.onedev.server.OneDev;
import io.onedev.server.util.interpolative.Interpolative;
import io.onedev.server.util.validation.annotation.UserName;
@@ -51,7 +52,7 @@ public class UserNameValidator implements ConstraintValidator<UserName, String>
}
constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();
return false;
- } else if (value.equals("new")) {
+ } else if (value.equals("new") || value.equals(OneDev.NAME)) {
constraintContext.disableDefaultConstraintViolation();
String message = this.message;
if (message.length() == 0)
diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
index 63df6b240f..55e9c7da96 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
@@ -313,7 +313,7 @@ public abstract class CodeCommentListPanel extends Panel {
@Override
public void populateItem(Item<ICellPopulator<CodeComment>> cellItem, String componentId, IModel<CodeComment> rowModel) {
CodeComment comment = rowModel.getObject();
- cellItem.add(new Label(componentId, DateUtils.formatAge(comment.getUpdateDate())));
+ cellItem.add(new Label(componentId, DateUtils.formatAge(comment.getLastUpdate().getDate())));
}
@Override
@@ -331,7 +331,7 @@ public abstract class CodeCommentListPanel extends Panel {
Item<CodeComment> item = super.newRowItem(id, index, model);
CodeComment comment = model.getObject();
item.add(AttributeAppender.append("class",
- comment.isVisitedAfter(comment.getUpdateDate())?"comment":"comment new"));
+ comment.isVisitedAfter(comment.getLastUpdate().getDate())?"comment":"comment new"));
return item;
}
});
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 f6556cb312..07363bde6f 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
@@ -27,7 +27,7 @@ class IssueChangePanel extends GenericPanel<IssueChange> {
else
add(new WebMarkupContainer("user").setVisible(false));
- add(new Label("description", change.getData().getDescription()));
+ add(new Label("description", change.getData().getActivity(null)));
add(new Label("age", DateUtils.formatAge(change.getDate())));
add(change.getData().render("body", change));
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 6620fd61bb..dc630764d1 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
@@ -8,7 +8,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;
@@ -45,7 +45,8 @@ class IssueOpenedPanel extends GenericPanel<Issue> {
@Override
protected void onSaveComment(AjaxRequestTarget target, String comment) {
- OneDev.getInstance(IssueChangeManager.class).changeDescription(getIssue(), comment);
+ getIssue().setDescription(comment);
+ OneDev.getInstance(IssueManager.class).save(getIssue());
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html
index 2f0cd4022d..e7612227d6 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html
@@ -44,8 +44,8 @@
<div class="state pull-left"><span wicket:id="state"></span></div>
<div wicket:id="fields" class="field pull-left"></div>
</div>
- <div class="submission pull-right">
- submitted by <a wicket:id="submitter"></a> <span wicket:id="submitDate"></span>
+ <div class="last-update pull-right">
+ <a wicket:id="user"></a> <span wicket:id="activity"></span> <span wicket:id="date"></span>
</div>
</div>
</wicket:fragment>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
index b7431e1b6a..99415f31c1 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
@@ -56,6 +56,7 @@ import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
+import io.onedev.server.model.support.LastUpdate;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.security.permission.AccessProject;
@@ -620,9 +621,15 @@ public abstract class IssueListPanel extends Panel {
}
fragment.add(fieldsView);
- User submitter = User.from(issue.getSubmitter(), issue.getSubmitterName());
- fragment.add(new UserIdentPanel("submitter", submitter, Mode.NAME));
- fragment.add(new Label("submitDate", DateUtils.formatAge(issue.getSubmitDate())));
+ LastUpdate lastUpdate = issue.getLastUpdate();
+ if (lastUpdate.getUser() != null || lastUpdate.getUserName() != null) {
+ User user = User.from(lastUpdate.getUser(), lastUpdate.getUserName());
+ fragment.add(new UserIdentPanel("user", user, Mode.NAME));
+ } else {
+ fragment.add(new WebMarkupContainer("user").setVisible(false));
+ }
+ fragment.add(new Label("activity", lastUpdate.getActivity()));
+ fragment.add(new Label("date", DateUtils.formatAge(lastUpdate.getDate())));
cellItem.add(fragment);
}
@@ -636,7 +643,7 @@ public abstract class IssueListPanel extends Panel {
Item<Issue> item = super.newRowItem(id, index, model);
Issue issue = model.getObject();
item.add(AttributeAppender.append("class",
- issue.isVisitedAfter(issue.getUpdateDate())?"issue":"issue new"));
+ issue.isVisitedAfter(issue.getLastUpdate().getDate())?"issue":"issue new"));
return item;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.css b/server-core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.css
index c7630a1119..fcabdb54a4 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.css
@@ -50,7 +50,7 @@
.issue-list>.body td .secondary>.pull-right {
margin-top: 8px;
}
-.issue-list>.body td .submission, .issue-list>.body td .comments, .issue-list>.body td .votes {
+.issue-list>.body td .last-update, .issue-list>.body td .comments, .issue-list>.body td .votes {
color: #888;
font-size: 13px;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java
index d0db0e75a4..2d2ced6f68 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java
@@ -5,6 +5,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.atomic.AtomicReference;
import javax.annotation.Nullable;
@@ -95,6 +96,8 @@ public abstract class IssueOperationsPanel extends Panel {
GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();
List<TransitionSpec> transitions = getIssue().getProject().getIssueSetting().getTransitionSpecs(true);
+
+ AtomicReference<Component> activeTransitionLinkRef = new AtomicReference<>(null);
for (TransitionSpec transition: transitions) {
if (transition.canTransitManually(getIssue(), null)) {
PressButtonTrigger trigger = (PressButtonTrigger) transition.getTrigger();
@@ -102,8 +105,23 @@ public abstract class IssueOperationsPanel extends Panel {
private String comment;
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ Component thisLink = this;
+ add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {
+
+ @Override
+ public String getObject() {
+ return activeTransitionLinkRef.get() == thisLink?"active":"";
+ }
+
+ }));
+ }
+
@Override
public void onClick(AjaxRequestTarget target) {
+ activeTransitionLinkRef.set(this);
Fragment fragment = new Fragment(ACTION_OPTIONS_ID, "transitionFrag", IssueOperationsPanel.this);
Class<?> fieldBeanClass = IssueUtils.defineFieldBeanClass(getIssue().getProject());
Serializable fieldBean = getIssue().getFieldBean(fieldBeanClass, true);
@@ -162,12 +180,14 @@ public abstract class IssueOperationsPanel extends Panel {
}
});
-
form.add(new AjaxLink<Void>("cancel") {
@Override
public void onClick(AjaxRequestTarget target) {
newEmptyActionOptions(target);
+ activeTransitionLinkRef.set(null);
+ for (Component each: transitionsView)
+ target.add(each);
}
});
@@ -176,8 +196,11 @@ public abstract class IssueOperationsPanel extends Panel {
fragment.setOutputMarkupId(true);
IssueOperationsPanel.this.replace(fragment);
target.add(fragment);
+
+ for (Component each: transitionsView)
+ target.add(each);
}
-
+
};
link.add(new Label("label", trigger.getButtonLabel()));
transitionsView.add(link);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/issue-operations.css b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/issue-operations.css
index 5dc4339cd6..24739940f4 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/issue-operations.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/issue-operations.css
@@ -18,6 +18,9 @@
padding: 7px 12px;
display: block;
}
+.issue-operations>.state-and-actions>.btn.active {
+ background-color: #204C72;
+}
.issue-operations>.state-and-actions>* {
margin-right: 10px;
margin-bottom: 8px;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html
index 49106090ea..a0a2f5490d 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html
@@ -39,8 +39,8 @@
<a wicket:id="source" title="Source"></a>
</div>
</div>
- <div class="submission pull-right">
- submitted by <a wicket:id="submitter"></a> <span wicket:id="submitDate"></span>
+ <div class="last-update pull-right">
+ <a wicket:id="user"></a> <span wicket:id="activity"></span> <span wicket:id="date"></span>
</div>
</div>
</wicket:fragment>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
index 48d17cd1e5..d69e9cd87b 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
@@ -52,6 +52,7 @@ import io.onedev.server.entitymanager.PullRequestManager;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
+import io.onedev.server.model.support.LastUpdate;
import io.onedev.server.search.entity.pullrequest.PullRequestQuery;
import io.onedev.server.security.permission.ReadCode;
import io.onedev.server.util.DateUtils;
@@ -332,9 +333,15 @@ public abstract class PullRequestListPanel extends Panel {
}.setEscapeModelStrings(false));
}
- User submitter = User.from(request.getSubmitter(), request.getSubmitterName());
- fragment.add(new UserIdentPanel("submitter", submitter, Mode.NAME));
- fragment.add(new Label("submitDate", DateUtils.formatAge(request.getSubmitDate())));
+ LastUpdate lastUpdate = request.getLastUpdate();
+ if (lastUpdate.getUser() != null || lastUpdate.getUserName() != null) {
+ User user = User.from(lastUpdate.getUser(), lastUpdate.getUserName());
+ fragment.add(new UserIdentPanel("user", user, Mode.NAME));
+ } else {
+ fragment.add(new WebMarkupContainer("user").setVisible(false));
+ }
+ fragment.add(new Label("activity", lastUpdate.getActivity()));
+ fragment.add(new Label("date", DateUtils.formatAge(lastUpdate.getDate())));
cellItem.add(fragment);
}
@@ -394,7 +401,7 @@ public abstract class PullRequestListPanel extends Panel {
Item<PullRequest> item = super.newRowItem(id, index, model);
PullRequest issue = model.getObject();
item.add(AttributeAppender.append("class",
- issue.isVisitedAfter(issue.getUpdateDate())?"request":"request new"));
+ issue.isVisitedAfter(issue.getLastUpdate().getDate())?"request":"request new"));
return item;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/pull-request-list.css b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/pull-request-list.css
index 870975c1d5..a6542308fd 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/pull-request-list.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/pull-request-list.css
@@ -53,7 +53,7 @@
color: #666;
margin: 0 4px;
}
-.pull-request-list>.body td .submission,
+.pull-request-list>.body td .last-update,
.pull-request-list>.body td .comments {
color: #888;
font-size: 13px;
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 c8e5ecfcef..f1842a0b2e 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
@@ -301,7 +301,7 @@ public abstract class BasePage extends WebPage {
}
protected final String getPageTitle() {
- return "OneDev - One Platform for Software Development";
+ return "OneDev - Super Easy All-in-One DevOps Platform";
};
protected int getPageRefreshInterval() {
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.java
index 4913e5f3f2..a8bddd6949 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
@@ -35,6 +35,7 @@ import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.revwalk.RevCommit;
+import org.joda.time.DateTime;
import com.google.common.collect.Lists;
@@ -205,6 +206,7 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {
}
PullRequestUpdate update = new PullRequestUpdate();
+ update.setDate(new DateTime(request.getSubmitDate()).plusSeconds(1).toDate());
request.addUpdate(update);
update.setRequest(request);
update.setHeadCommitHash(request.getHeadCommitHash());
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html
index 6fb60c39dd..4881cd8615 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html
@@ -85,7 +85,7 @@
<div wicket:id="feedback"></div>
<form wicket:id="form" class="leave-confirm">
<div wicket:id="note"></div>
- <input wicket:id="submit" type="submit" value="Confirm" class="btn">
+ <input wicket:id="submit" type="submit" value="Ok" class="btn btn-primary">
<input wicket:id="cancel" type="button" value="Cancel" class="btn btn-default">
</form>
</wicket:fragment>
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 06745f2581..de03ff497b 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
@@ -1,5 +1,6 @@
package io.onedev.server.web.page.project.pullrequests.detail;
+import static io.onedev.server.model.Build.FIELD_JOB;
import static io.onedev.server.model.support.pullrequest.MergeStrategy.CREATE_MERGE_COMMIT;
import static io.onedev.server.model.support.pullrequest.MergeStrategy.CREATE_MERGE_COMMIT_IF_NECESSARY;
import static io.onedev.server.model.support.pullrequest.MergeStrategy.REBASE_SOURCE_BRANCH_COMMITS;
@@ -8,7 +9,6 @@ import static io.onedev.server.search.entity.build.BuildQuery.getRuleName;
import static io.onedev.server.search.entity.build.BuildQueryLexer.And;
import static io.onedev.server.search.entity.build.BuildQueryLexer.AssociatedWithPullRequest;
import static io.onedev.server.search.entity.build.BuildQueryLexer.Is;
-import static io.onedev.server.model.Build.FIELD_JOB;
import static io.onedev.server.util.criteria.Criteria.quote;
import static io.onedev.server.web.page.project.pullrequests.detail.PullRequestOperation.APPROVE;
import static io.onedev.server.web.page.project.pullrequests.detail.PullRequestOperation.DELETE_SOURCE_BRANCH;
@@ -161,6 +161,8 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
private MergeStrategy mergeStrategy;
+ private PullRequestOperation activeOperation;
+
public PullRequestDetailPage(PageParameters params) {
super(params);
@@ -893,6 +895,17 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
return mergeStatusContainer;
}
+ private AttributeAppender newOperationAppender(PullRequestOperation operation) {
+ return AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {
+
+ @Override
+ public String getObject() {
+ return operation == activeOperation?"active":"";
+ }
+
+ });
+ }
+
private WebMarkupContainer newOperationsContainer() {
WebMarkupContainer operationsContainer = new WebMarkupContainer("operations") {
@@ -923,6 +936,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
@Override
public void onClick(AjaxRequestTarget target) {
+ activeOperation = APPROVE;
reviewUpdateId = getPullRequest().getLatestUpdate().getId();
operationsContainer.replace(newOperationConfirm(confirmId, APPROVE, operationsContainer));
target.add(operationsContainer);
@@ -932,15 +946,16 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(APPROVE.canOperate(getPullRequest()) && !operationsContainer.get(confirmId).isVisible());
+ setVisible(APPROVE.canOperate(getPullRequest()));
}
- });
+ }.add(newOperationAppender(APPROVE)));
operationsContainer.add(new AjaxLink<Void>("requestForChanges") {
@Override
public void onClick(AjaxRequestTarget target) {
+ activeOperation = REQUEST_FOR_CHANGES;
reviewUpdateId = getPullRequest().getLatestUpdate().getId();
operationsContainer.replace(newOperationConfirm(confirmId, REQUEST_FOR_CHANGES, operationsContainer));
target.add(operationsContainer);
@@ -950,15 +965,16 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(REQUEST_FOR_CHANGES.canOperate(getPullRequest()) && !operationsContainer.get(confirmId).isVisible());
+ setVisible(REQUEST_FOR_CHANGES.canOperate(getPullRequest()));
}
- });
+ }.add(newOperationAppender(REQUEST_FOR_CHANGES)));
operationsContainer.add(new AjaxLink<Void>("discard") {
@Override
public void onClick(AjaxRequestTarget target) {
+ activeOperation = DISCARD;
operationsContainer.replace(newOperationConfirm(confirmId, DISCARD, operationsContainer));
target.add(operationsContainer);
target.appendJavaScript("setTimeout(function() {$(window).resize();}, 0);");
@@ -967,14 +983,16 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(DISCARD.canOperate(getPullRequest()) && !operationsContainer.get(confirmId).isVisible());
+ setVisible(DISCARD.canOperate(getPullRequest()));
}
- });
+ }.add(newOperationAppender(DISCARD)));
+
operationsContainer.add(new AjaxLink<Void>("reopen") {
@Override
public void onClick(AjaxRequestTarget target) {
+ activeOperation = REOPEN;
operationsContainer.replace(newOperationConfirm(confirmId, REOPEN, operationsContainer));
target.add(operationsContainer);
target.appendJavaScript("setTimeout(function() {$(window).resize();}, 0);");
@@ -983,14 +1001,16 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(REOPEN.canOperate(getPullRequest()) && !operationsContainer.get(confirmId).isVisible());
+ setVisible(REOPEN.canOperate(getPullRequest()));
}
- });
+ }.add(newOperationAppender(REOPEN)));
+
operationsContainer.add(new AjaxLink<Void>("deleteSourceBranch") {
@Override
public void onClick(AjaxRequestTarget target) {
+ activeOperation = DELETE_SOURCE_BRANCH;
operationsContainer.replace(newOperationConfirm(confirmId, DELETE_SOURCE_BRANCH, operationsContainer));
target.add(operationsContainer);
target.appendJavaScript("setTimeout(function() {$(window).resize();}, 0);");
@@ -999,14 +1019,16 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(DELETE_SOURCE_BRANCH.canOperate(getPullRequest()) && !operationsContainer.get(confirmId).isVisible());
+ setVisible(DELETE_SOURCE_BRANCH.canOperate(getPullRequest()));
}
- });
+ }.add(newOperationAppender(DELETE_SOURCE_BRANCH)));
+
operationsContainer.add(new AjaxLink<Void>("restoreSourceBranch") {
@Override
public void onClick(AjaxRequestTarget target) {
+ activeOperation = RESTORE_SOURCE_BRANCH;
operationsContainer.replace(newOperationConfirm(confirmId, RESTORE_SOURCE_BRANCH, operationsContainer));
target.add(operationsContainer);
target.appendJavaScript("setTimeout(function() {$(window).resize();}, 0);");
@@ -1015,10 +1037,10 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(RESTORE_SOURCE_BRANCH.canOperate(getPullRequest()) && !operationsContainer.get(confirmId).isVisible());
+ setVisible(RESTORE_SOURCE_BRANCH.canOperate(getPullRequest()));
}
- });
+ }.add(newOperationAppender(RESTORE_SOURCE_BRANCH)));
operationsContainer.add(new WebMarkupContainer(confirmId).setVisible(false));
@@ -1115,24 +1137,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
}
}
- }.add(AttributeModifier.replace("value", new AbstractReadOnlyModel<String>() {
-
- @Override
- public String getObject() {
- return "Confirm " + getOperationName(operation);
- }
-
- })).add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {
-
- @Override
- public String getObject() {
- if (operation == DISCARD)
- return "btn-danger";
- else
- return "btn-primary";
- }
-
- })));
+ });
form.add(new AjaxLink<Void>("cancel") {
@Override
@@ -1143,6 +1148,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR
@Override
public void onClick(AjaxRequestTarget target) {
+ activeOperation = null;
fragment.replaceWith(new WebMarkupContainer(id).setVisible(false));
target.add(operationsContainer);
target.appendJavaScript("setTimeout(function() {$(window).resize();}, 0);");
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 f2bd14ac72..f3b75e00a5 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
@@ -208,7 +208,7 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {
PullRequestActivity lastActivity = (PullRequestActivity) prevActivityRow.getDefaultModelObject();
List<PullRequestActivity> newActivities = new ArrayList<>();
for (PullRequestActivity activity: getActivities()) {
- if (activity.getDate().getTime() > lastActivity.getDate().getTime())
+ if (activity.getDate().after(lastActivity.getDate()))
newActivities.add(activity);
}
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 3f0d9c7edb..62c7e840ea 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
@@ -33,7 +33,7 @@ class PullRequestChangePanel extends GenericPanel<PullRequestChange> {
else
add(new WebMarkupContainer("user").setVisible(false));
- add(new Label("description", change.getData().getDescription()));
+ add(new Label("description", change.getData().getActivity(null)));
add(new Label("age", DateUtils.formatAge(change.getDate())));
add(new SinceChangesLink("changes", new AbstractReadOnlyModel<PullRequest>() {
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 4a1274c132..478c376ec8 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
@@ -3,13 +3,12 @@ package io.onedev.server.web.page.project.pullrequests.detail.activities.activit
import java.util.List;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.event.Broadcast;
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.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;
@@ -21,7 +20,6 @@ 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;
-import io.onedev.server.web.websocket.PageDataChanged;
@SuppressWarnings("serial")
class PullRequestOpenedPanel extends GenericPanel<PullRequest> {
@@ -47,8 +45,8 @@ class PullRequestOpenedPanel extends GenericPanel<PullRequest> {
@Override
protected void onSaveComment(AjaxRequestTarget target, String comment) {
- OneDev.getInstance(PullRequestChangeManager.class).changeDescription(getPullRequest(), comment);
- send(getPage(), Broadcast.BREADTH, new PageDataChanged(target));
+ getPullRequest().setDescription(comment);
+ OneDev.getInstance(PullRequestManager.class).save(getPullRequest());
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/pull-request-activities.css b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/pull-request-activities.css
index 532e3efcd7..07c24ce2b2 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/pull-request-activities.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/pull-request-activities.css
@@ -35,9 +35,12 @@
position: relative;
padding: 6px 0;
}
+#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit:hover {
+ background: #F7ECB9;
+}
#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit>.author {
position: absolute;
- left: 0;
+ left: 4px;
top: 6px;
}
#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit>.message {
@@ -49,7 +52,7 @@
#request-detail>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit>.actions {
position: absolute;
top: 6px;
- right: 0;
+ right: 4px;
}
#request-detail>.main>.activities .activity>td>.content {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css
index dce9efec8c..247d75ff0c 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css
@@ -84,7 +84,9 @@
#request-detail>.main>.summary .no-conflict>* {
margin-right: 4px;
}
-
+#request-detail>.main>.summary>.operations>.confirm {
+ margin-top: 12px;
+}
#request-detail>.main>.summary>.operations>.confirm>.hint {
margin-bottom: 12px;
font-size: 16px;
@@ -96,6 +98,13 @@
#request-detail>.main>.summary>.operations>.confirm>form>input {
margin-right: 8px;
}
+#request-detail>.main>.summary>.operations>.buttons>.btn-primary.active {
+ background-color: #204C72;
+}
+#request-detail>.main>.summary>.operations>.buttons>.btn-danger.active {
+ background-color: #A62924;
+}
+
#request-detail>.main>.summary>.operations>.confirm>form .markdown-editor {
margin-bottom: 16px;
}