The Unified and Autonomous Development Platform
Fix the issue that SelectToAdd component does not clear the option if itself is rendered
robin shendb8ae8ade758
diff --git a/core/src/main/java/io/onedev/server/CoreModule.java b/core/src/main/java/io/onedev/server/CoreModule.javaindex 8de3be11f1..6acd4e41c9 100644--- a/core/src/main/java/io/onedev/server/CoreModule.java+++ b/core/src/main/java/io/onedev/server/CoreModule.java@@ -112,7 +112,7 @@ import io.onedev.server.manager.PullRequestManager;import io.onedev.server.manager.PullRequestNotificationManager;import io.onedev.server.manager.PullRequestReferenceManager;import io.onedev.server.manager.PullRequestStatusChangeManager;-import io.onedev.server.manager.PullRequestTaskManager;+import io.onedev.server.manager.TaskManager;import io.onedev.server.manager.PullRequestUpdateManager;import io.onedev.server.manager.PullRequestWatchManager;import io.onedev.server.manager.ReviewInvitationManager;@@ -155,7 +155,7 @@ import io.onedev.server.manager.impl.DefaultPullRequestManager;import io.onedev.server.manager.impl.DefaultPullRequestNotificationManager;import io.onedev.server.manager.impl.DefaultPullRequestReferenceManager;import io.onedev.server.manager.impl.DefaultPullRequestStatusChangeManager;-import io.onedev.server.manager.impl.DefaultPullRequestTaskManager;+import io.onedev.server.manager.impl.DefaultTaskManager;import io.onedev.server.manager.impl.DefaultPullRequestUpdateManager;import io.onedev.server.manager.impl.DefaultPullRequestWatchManager;import io.onedev.server.manager.impl.DefaultReviewInvitationManager;@@ -300,7 +300,7 @@ public class CoreModule extends AbstractPluginModule {bind(ReviewManager.class).to(DefaultReviewManager.class);bind(MailManager.class).to(DefaultMailManager.class);bind(BranchWatchManager.class).to(DefaultBranchWatchManager.class);- bind(PullRequestTaskManager.class).to(DefaultPullRequestTaskManager.class);+ bind(TaskManager.class).to(DefaultTaskManager.class);bind(IssueManager.class).to(DefaultIssueManager.class);bind(IssueFieldUnaryManager.class).to(DefaultIssueFieldUnaryManager.class);bind(PullRequestWatchManager.class).to(DefaultPullRequestWatchManager.class);diff --git a/core/src/main/java/io/onedev/server/manager/PullRequestTaskManager.java b/core/src/main/java/io/onedev/server/manager/PullRequestTaskManager.javadeleted file mode 100644index 1aeba6669a..0000000000--- a/core/src/main/java/io/onedev/server/manager/PullRequestTaskManager.java+++ /dev/null@@ -1,8 +0,0 @@-package io.onedev.server.manager;--import io.onedev.server.model.PullRequestTask;-import io.onedev.server.persistence.dao.EntityManager;--public interface PullRequestTaskManager extends EntityManager<PullRequestTask> {--}diff --git a/core/src/main/java/io/onedev/server/manager/TaskManager.java b/core/src/main/java/io/onedev/server/manager/TaskManager.javanew file mode 100644index 0000000000..1ea874e232--- /dev/null+++ b/core/src/main/java/io/onedev/server/manager/TaskManager.java@@ -0,0 +1,26 @@+package io.onedev.server.manager;++import java.util.Collection;++import javax.annotation.Nullable;++import io.onedev.server.model.Issue;+import io.onedev.server.model.PullRequest;+import io.onedev.server.model.Task;+import io.onedev.server.model.User;+import io.onedev.server.persistence.dao.EntityManager;++public interface TaskManager extends EntityManager<Task> {++ Collection<Task> findAll(PullRequest request, @Nullable User user, @Nullable String description);++ Collection<Task> findAll(Issue issue, @Nullable User user, @Nullable String description);++ void deleteTasks(PullRequest request, @Nullable User user, @Nullable String description);++ Task addTask(PullRequest request, User user, String description);++ Task addTask(Issue issue, User user, String description);++ void deleteTasks(Issue issue, @Nullable User user, @Nullable String description);+}diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueNotificationManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueNotificationManager.javaindex bbd00e6d57..3827087c3e 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueNotificationManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueNotificationManager.java@@ -120,29 +120,29 @@ public class DefaultIssueNotificationManager implements IssueNotificationManagerOneDev.getInstance(VisitManager.class).visitIssue(event.getUser(), issue);- if (event instanceof IssueOpened) {- Map<String, Optional<IssueQuery>> parsedQueries = new HashMap<>();-- for (IssueQuerySetting setting: issue.getProject().getIssueQuerySettings()) {- boolean watched = false;- for (Map.Entry<String, Boolean> entry: setting.getUserQueryWatches().entrySet()) {- if (matches(parsedQueries, issue, setting.getUserQueries().get(entry.getKey()))) {+ Map<String, Optional<IssueQuery>> parsedQueries = new HashMap<>();++ for (IssueQuerySetting setting: issue.getProject().getIssueQuerySettings()) {+ boolean watched = false;+ for (Map.Entry<String, Boolean> entry: setting.getUserQueryWatches().entrySet()) {+ if (matches(parsedQueries, issue, setting.getUserQueries().get(entry.getKey()))) {+ watch(issue, setting.getUser(), entry.getValue());+ watched = true;+ break;+ }+ }+ if (!watched) {+ for (Map.Entry<String, Boolean> entry: setting.getProjectQueryWatches().entrySet()) {+ if (matches(parsedQueries, issue, issue.getProject().getIssueWorkflow().getSavedQueries().get(entry.getKey()))) {watch(issue, setting.getUser(), entry.getValue());watched = true;break;}}- if (!watched) {- for (Map.Entry<String, Boolean> entry: setting.getProjectQueryWatches().entrySet()) {- if (matches(parsedQueries, issue, issue.getProject().getIssueWorkflow().getSavedQueries().get(entry.getKey()))) {- watch(issue, setting.getUser(), entry.getValue());- watched = true;- break;- }- }- }}- } else if (event instanceof IssueChanged) {+ }++ if (event instanceof IssueChanged) {IssueChange issueChange = ((IssueChanged) event).getChange();for (Group group: issueChange.getData().getNewGroups().values())involvedUsers.addAll(group.getMembers());diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestNotificationManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestNotificationManager.javaindex 9dc7084584..1d5eb872e3 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestNotificationManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestNotificationManager.java@@ -1,9 +1,5 @@package io.onedev.server.manager.impl;-import static io.onedev.server.model.PullRequestTask.Type.RESOLVE_CONFLICT;-import static io.onedev.server.model.PullRequestTask.Type.REVIEW;-import static io.onedev.server.model.PullRequestTask.Type.UPDATE;-import java.util.Collection;import java.util.Date;import java.util.HashSet;@@ -14,7 +10,6 @@ import javax.inject.Inject;import javax.inject.Singleton;import org.eclipse.jgit.util.StringUtils;-import org.hibernate.criterion.Restrictions;import com.google.common.collect.Sets;@@ -39,20 +34,19 @@ import io.onedev.server.manager.BranchWatchManager;import io.onedev.server.manager.MailManager;import io.onedev.server.manager.MarkdownManager;import io.onedev.server.manager.PullRequestNotificationManager;-import io.onedev.server.manager.PullRequestTaskManager;import io.onedev.server.manager.PullRequestWatchManager;+import io.onedev.server.manager.TaskManager;import io.onedev.server.manager.UrlManager;import io.onedev.server.manager.VisitManager;import io.onedev.server.model.BranchWatch;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestStatusChange;import io.onedev.server.model.PullRequestStatusChange.Type;-import io.onedev.server.model.PullRequestTask;import io.onedev.server.model.PullRequestWatch;import io.onedev.server.model.ReviewInvitation;+import io.onedev.server.model.Task;import io.onedev.server.model.User;import io.onedev.server.persistence.annotation.Transactional;-import io.onedev.server.persistence.dao.EntityCriteria;import io.onedev.server.util.QualityCheckStatus;import io.onedev.server.util.editable.EditableUtils;import io.onedev.server.util.markdown.MentionParser;@@ -70,20 +64,20 @@ public class DefaultPullRequestNotificationManager implements PullRequestNotificprivate final MarkdownManager markdownManager;- private final PullRequestTaskManager pullRequestTaskManager;+ private final TaskManager taskManager;private final PullRequestWatchManager pullRequestWatchManager;@Injectpublic DefaultPullRequestNotificationManager(MarkdownManager markdownManager, BranchWatchManager branchWatchManager,MailManager mailManager, UrlManager urlManager, VisitManager visitInfoManager,- PullRequestWatchManager pullRequestWatchManager, PullRequestTaskManager pullRequestTaskManager) {+ PullRequestWatchManager pullRequestWatchManager, TaskManager taskManager) {this.branchWatchManager = branchWatchManager;this.mailManager = mailManager;this.urlManager = urlManager;this.visitInfoManager = visitInfoManager;this.markdownManager = markdownManager;- this.pullRequestTaskManager = pullRequestTaskManager;+ this.taskManager = taskManager;this.pullRequestWatchManager = pullRequestWatchManager;}@@ -125,25 +119,14 @@ public class DefaultPullRequestNotificationManager implements PullRequestNotificprivate boolean process(ReviewInvitation invitation, String subject) {PullRequest request = invitation.getRequest();User user = invitation.getUser();- EntityCriteria<PullRequestTask> criteria = EntityCriteria.of(PullRequestTask.class);- criteria.add(Restrictions.eq("request", request))- .add(Restrictions.eq("user", user))- .add(Restrictions.eq("type", REVIEW));boolean notified = false;if (invitation.getType() == ReviewInvitation.Type.EXCLUDE) {- for (PullRequestTask task: pullRequestTaskManager.findAll(criteria))- pullRequestTaskManager.delete(task);+ taskManager.deleteTasks(request, user, Task.DESC_REVIEW);} else {- if (pullRequestTaskManager.find(criteria) == null) {- PullRequestTask task = new PullRequestTask();- task.setRequest(request);- task.setUser(user);- task.setType(REVIEW);-- pullRequestTaskManager.save(task);-+ if (taskManager.findAll(request, user, Task.DESC_REVIEW).isEmpty()) {+ taskManager.addTask(request, user, Task.DESC_REVIEW);String url = urlManager.urlFor(request);String body = String.format(""+ "Dear %s,"@@ -154,7 +137,7 @@ public class DefaultPullRequestNotificationManager implements PullRequestNotific+ "<p style='margin: 16px 0;'>"+ "-- Sent by OneDev",user.getDisplayName(), subject, url, url);- mailManager.sendMailAsync(Sets.newHashSet(task.getUser().getEmail()), subject, body);+ mailManager.sendMailAsync(Sets.newHashSet(user.getEmail()), subject, body);notified = true;}watch(request, user, "You are set to watch this pull request as you are invited as a reviewer.");@@ -182,10 +165,7 @@ public class DefaultPullRequestNotificationManager implements PullRequestNotificnotifiedUsers.add(invitation.getUser());}} else if (event instanceof PullRequestUpdated) {- EntityCriteria<PullRequestTask> criteria = EntityCriteria.of(PullRequestTask.class);- criteria.add(Restrictions.eq("request", request)).add(Restrictions.eq("type", UPDATE));- for (PullRequestTask task: pullRequestTaskManager.findAll(criteria))- pullRequestTaskManager.delete(task);+ taskManager.deleteTasks(request, null, Task.DESC_UPDATE);if (!request.isMergeIntoTarget()) {QualityCheckStatus qualityCheckStatus = request.getQualityCheckStatus();@@ -201,23 +181,10 @@ public class DefaultPullRequestNotificationManager implements PullRequestNotific} else if (event instanceof PullRequestMergePreviewCalculated) {if (request.getSubmitter() != null && request.getMergePreview() != null) {if (request.getMergePreview().getMerged() != null) {- EntityCriteria<PullRequestTask> criteria = EntityCriteria.of(PullRequestTask.class);- criteria.add(Restrictions.eq("user", request.getSubmitter()))- .add(Restrictions.eq("type", RESOLVE_CONFLICT));- for (PullRequestTask task: pullRequestTaskManager.findAll(criteria)) {- pullRequestTaskManager.delete(task);- }+ taskManager.deleteTasks(request, request.getSubmitter(), Task.DESC_RESOLVE_CONFLICT);} else {- PullRequestTask task = new PullRequestTask();- task.setRequest(request);- task.setUser(request.getSubmitter());- task.setType(RESOLVE_CONFLICT);- EntityCriteria<PullRequestTask> criteria = EntityCriteria.of(PullRequestTask.class);- criteria.add(Restrictions.eq("request", task.getRequest()))- .add(Restrictions.eq("user", request.getSubmitter()))- .add(Restrictions.eq("type", task.getType()));- if (pullRequestTaskManager.find(criteria) == null) {- pullRequestTaskManager.save(task);+ if (taskManager.findAll(request, request.getSubmitter(), Task.DESC_RESOLVE_CONFLICT).isEmpty()) {+ taskManager.addTask(request, request.getSubmitter(), Task.DESC_RESOLVE_CONFLICT);String subject = String.format("Please resolve conflicts in pull request #%d - %s",request.getNumber(), request.getTitle());String url = urlManager.urlFor(request);@@ -242,23 +209,11 @@ public class DefaultPullRequestNotificationManager implements PullRequestNotificPullRequestStatusChangeEvent statusChangeEvent = (PullRequestStatusChangeEvent)event;PullRequestStatusChange statusChange = statusChangeEvent.getStatusChange();PullRequestStatusChange.Type type = statusChange.getType();- EntityCriteria<PullRequestTask> criteria = EntityCriteria.of(PullRequestTask.class);- criteria.add(Restrictions.eq("request", request));if (type == PullRequestStatusChange.Type.APPROVED || type == PullRequestStatusChange.Type.DISAPPROVED) {- criteria.add(Restrictions.eq("user", statusChange.getUser())).add(Restrictions.eq("type", REVIEW));- for (PullRequestTask task: pullRequestTaskManager.findAll(criteria))- pullRequestTaskManager.delete(task);+ taskManager.deleteTasks(request, statusChange.getUser(), Task.DESC_REVIEW);if (type == PullRequestStatusChange.Type.DISAPPROVED && request.getSubmitter() != null) {- PullRequestTask task = new PullRequestTask();- task.setRequest(request);- task.setUser(request.getSubmitter());- task.setType(UPDATE);- criteria = EntityCriteria.of(PullRequestTask.class);- criteria.add(Restrictions.eq("request", task.getRequest()))- .add(Restrictions.eq("user", task.getUser()))- .add(Restrictions.eq("type", task.getType()));- if (pullRequestTaskManager.find(criteria) == null) {- pullRequestTaskManager.save(task);+ if (taskManager.findAll(request, request.getSubmitter(), Task.DESC_UPDATE).isEmpty()) {+ taskManager.addTask(request, request.getSubmitter(), Task.DESC_UPDATE);String subject = String.format("%s disapproved pull request #%d - %s",event.getUser().getDisplayName(), request.getNumber(), request.getTitle());String url = urlManager.urlFor(request);@@ -277,8 +232,7 @@ public class DefaultPullRequestNotificationManager implements PullRequestNotific}}} else if (type == PullRequestStatusChange.Type.MERGED || type == PullRequestStatusChange.Type.DISCARDED) {- for (PullRequestTask task: pullRequestTaskManager.findAll(criteria))- pullRequestTaskManager.delete(task);+ taskManager.deleteTasks(request, null, null);} else if (type == PullRequestStatusChange.Type.REMOVED_REVIEWER) {String subject = String.format("You no longer needs to review pull request #%d - %s", request.getNumber(),request.getTitle());diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestTaskManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestTaskManager.javadeleted file mode 100644index f9d1706ba7..0000000000--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestTaskManager.java+++ /dev/null@@ -1,19 +0,0 @@-package io.onedev.server.manager.impl;--import javax.inject.Inject;-import javax.inject.Singleton;--import io.onedev.server.manager.PullRequestTaskManager;-import io.onedev.server.model.PullRequestTask;-import io.onedev.server.persistence.dao.AbstractEntityManager;-import io.onedev.server.persistence.dao.Dao;--@Singleton-public class DefaultPullRequestTaskManager extends AbstractEntityManager<PullRequestTask> implements PullRequestTaskManager {-- @Inject- public DefaultPullRequestTaskManager(Dao dao) {- super(dao);- }--}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultTaskManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultTaskManager.javanew file mode 100644index 0000000000..1afede63d0--- /dev/null+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultTaskManager.java@@ -0,0 +1,120 @@+package io.onedev.server.manager.impl;++import java.util.Collection;++import javax.inject.Inject;+import javax.inject.Singleton;+import javax.persistence.Query;++import org.hibernate.criterion.Restrictions;++import io.onedev.launcher.loader.Listen;+import io.onedev.server.manager.TaskManager;+import io.onedev.server.model.Issue;+import io.onedev.server.model.PullRequest;+import io.onedev.server.model.Task;+import io.onedev.server.model.User;+import io.onedev.server.persistence.annotation.Sessional;+import io.onedev.server.persistence.annotation.Transactional;+import io.onedev.server.persistence.dao.AbstractEntityManager;+import io.onedev.server.persistence.dao.Dao;+import io.onedev.server.persistence.dao.EntityCriteria;+import io.onedev.server.persistence.dao.EntityRemoved;++@Singleton+public class DefaultTaskManager extends AbstractEntityManager<Task> implements TaskManager {++ @Inject+ public DefaultTaskManager(Dao dao) {+ super(dao);+ }++ @Transactional+ @Listen+ public void on(EntityRemoved event) {+ if (event.getEntity() instanceof Issue) {+ Issue issue = (Issue) event.getEntity();+ Query query = getSession().createQuery("delete from Task where project=:project and type=:type and source=:source");+ query.setParameter("project", issue.getProject());+ query.setParameter("type", Task.TYPE_ISSUE);+ query.setParameter("source", issue.getNumberStr());+ query.executeUpdate();+ } else if (event.getEntity() instanceof PullRequest) {+ PullRequest pullRequest = (PullRequest) event.getEntity();+ Query query = getSession().createQuery("delete from PullRequest where type=:type and source=:source");+ query.setParameter("project", pullRequest.getTargetProject());+ query.setParameter("type", Task.TYPE_PULLREQUEST);+ query.setParameter("source", pullRequest.getNumberStr());+ query.executeUpdate();+ }+ }++ @Sessional+ @Override+ public Collection<Task> findAll(PullRequest request, User user, String description) {+ EntityCriteria<Task> criteria = EntityCriteria.of(Task.class);+ criteria.add(Restrictions.eq("project", request.getTargetProject()))+ .add(Restrictions.eq("type", Task.TYPE_PULLREQUEST))+ .add(Restrictions.eq("source", request.getNumberStr()));+ if (user != null)+ criteria.add(Restrictions.eq("user", user));+ if (description != null)+ criteria.add(Restrictions.eq("description", description));+ return findAll(criteria);+ }++ @Sessional+ @Override+ public Collection<Task> findAll(Issue issue, User user, String description) {+ EntityCriteria<Task> criteria = EntityCriteria.of(Task.class);+ criteria.add(Restrictions.eq("project", issue.getProject()))+ .add(Restrictions.eq("type", Task.TYPE_ISSUE))+ .add(Restrictions.eq("source", issue.getNumberStr()));+ if (user != null)+ criteria.add(Restrictions.eq("user", user));+ if (description != null)+ criteria.add(Restrictions.eq("description", description));+ return findAll(criteria);+ }++ @Transactional+ @Override+ public Task addTask(PullRequest request, User user, String description) {+ Task task = new Task();+ task.setDescription(description);+ task.setUser(user);+ task.setProject(request.getTargetProject());+ task.setType(Task.TYPE_PULLREQUEST);+ task.setSource(request.getNumberStr());+ save(task);+ return task;+ }++ @Transactional+ @Override+ public Task addTask(Issue issue, User user, String description) {+ Task task = new Task();+ task.setDescription(description);+ task.setUser(user);+ task.setProject(issue.getProject());+ task.setType(Task.TYPE_ISSUE);+ task.setSource(issue.getNumberStr());+ save(task);+ return task;+ }++ @Transactional+ @Override+ public void deleteTasks(PullRequest request, User user, String description) {+ for (Task task: findAll(request, user, description))+ delete(task);+ }++ @Transactional+ @Override+ public void deleteTasks(Issue issue, User user, String description) {+ for (Task task: findAll(issue, user, description))+ delete(task);+ }++}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/model/Issue.java b/core/src/main/java/io/onedev/server/model/Issue.javaindex 371520ae9a..de3639b5aa 100644--- a/core/src/main/java/io/onedev/server/model/Issue.java+++ b/core/src/main/java/io/onedev/server/model/Issue.java@@ -203,6 +203,14 @@ public class Issue extends AbstractEntity implements Referenceable {numberStr = String.valueOf(number);}+ public String getNumberStr() {+ return numberStr;+ }++ public void setNumberStr(String numberStr) {+ this.numberStr = numberStr;+ }+public User getSubmitter() {return submitter;}diff --git a/core/src/main/java/io/onedev/server/model/Project.java b/core/src/main/java/io/onedev/server/model/Project.javaindex 4496872b60..f674c00385 100644--- a/core/src/main/java/io/onedev/server/model/Project.java+++ b/core/src/main/java/io/onedev/server/model/Project.java@@ -171,6 +171,9 @@ public class Project extends AbstractEntity {@OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)private Collection<IssueQuerySetting> issueQuerySettings = new ArrayList<>();+ @OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)+ private Collection<Task> tasks = new ArrayList<>();+@Lob@Column(nullable=false, length=65535)private IssueWorkflow issueWorkflow = new IssueWorkflow();diff --git a/core/src/main/java/io/onedev/server/model/PullRequest.java b/core/src/main/java/io/onedev/server/model/PullRequest.javaindex cf879eb232..8a7c153508 100644--- a/core/src/main/java/io/onedev/server/model/PullRequest.java+++ b/core/src/main/java/io/onedev/server/model/PullRequest.java@@ -172,9 +172,6 @@ public class PullRequest extends AbstractEntity implements Referenceable {@OneToMany(mappedBy="request", cascade=CascadeType.REMOVE)private Collection<PullRequestStatusChange> statusChanges = new ArrayList<>();- @OneToMany(mappedBy="request", cascade=CascadeType.REMOVE)- private Collection<PullRequestTask> tasks = new ArrayList<>();-@OneToMany(mappedBy="request", cascade=CascadeType.REMOVE)private Collection<PullRequestWatch> watches = new ArrayList<>();@@ -394,14 +391,6 @@ public class PullRequest extends AbstractEntity implements Referenceable {this.statusChanges = statusChanges;}- public Collection<PullRequestTask> getTasks() {- return tasks;- }-- public void setTasks(Collection<PullRequestTask> tasks) {- this.tasks = tasks;- }-public Collection<PullRequestWatch> getWatches() {return watches;}diff --git a/core/src/main/java/io/onedev/server/model/PullRequestTask.java b/core/src/main/java/io/onedev/server/model/PullRequestTask.javadeleted file mode 100644index 8c547e5e00..0000000000--- a/core/src/main/java/io/onedev/server/model/PullRequestTask.java+++ /dev/null@@ -1,86 +0,0 @@-package io.onedev.server.model;--import java.util.Date;--import javax.persistence.Column;-import javax.persistence.Entity;-import javax.persistence.FetchType;-import javax.persistence.Index;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;-import javax.persistence.Table;-import javax.persistence.UniqueConstraint;--@Entity-@Table(- indexes={@Index(columnList="g_request_id"), @Index(columnList="g_user_id"), @Index(columnList="type")},- uniqueConstraints={@UniqueConstraint(columnNames={"g_request_id", "g_user_id", "type"})-})-public class PullRequestTask extends AbstractEntity {-- private static final long serialVersionUID = 1L;-- public enum Type {- REVIEW("There are new changes to review"),- UPDATE("Someone disapproved current changes"),- RESOLVE_CONFLICT("There are merge conflicts");-- private final String displayName;-- Type(String displayName) {- this.displayName = displayName;- }-- @Override- public String toString() {- return displayName;- }- };-- @ManyToOne(fetch=FetchType.LAZY)- @JoinColumn(nullable=false)- private PullRequest request;-- @ManyToOne(fetch=FetchType.LAZY)- @JoinColumn(nullable=false)- private User user;-- @Column(nullable=false)- private Type type;-- @Column(nullable=false)- private Date date = new Date();-- public PullRequest getRequest() {- return request;- }-- public void setRequest(PullRequest request) {- this.request = request;- }-- public User getUser() {- return user;- }-- public void setUser(User user) {- this.user = user;- }-- public Type getType() {- return type;- }-- public void setType(Type type) {- this.type = type;- }-- public Date getDate() {- return date;- }-- public void setDate(Date date) {- this.date = date;- }--}diff --git a/core/src/main/java/io/onedev/server/model/Task.java b/core/src/main/java/io/onedev/server/model/Task.javanew file mode 100644index 0000000000..09eb7bb809--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/Task.java@@ -0,0 +1,102 @@+package io.onedev.server.model;++import java.util.Date;++import javax.persistence.Column;+import javax.persistence.Entity;+import javax.persistence.FetchType;+import javax.persistence.Index;+import javax.persistence.JoinColumn;+import javax.persistence.ManyToOne;+import javax.persistence.Table;+import javax.persistence.UniqueConstraint;++@Entity+@Table(+ indexes={@Index(columnList="g_project_id"), @Index(columnList="g_user_id"),+ @Index(columnList="type"), @Index(columnList="source"), @Index(columnList="description")},+ uniqueConstraints={@UniqueConstraint(columnNames={"g_project_id", "g_user_id", "type", "source", "description"})+})+public class Task extends AbstractEntity {++ private static final long serialVersionUID = 1L;++ public static final String TYPE_PULLREQUEST = "Pull Request";++ public static final String TYPE_ISSUE = "Issue";++ public static final String DESC_REVIEW = "There are new changes to review";++ public static final String DESC_UPDATE = "Someone disapproved current changes";++ public static final String DESC_RESOLVE_CONFLICT = "There are merge conflicts";++ @ManyToOne(fetch=FetchType.LAZY)+ @JoinColumn(nullable=false)+ private Project project;++ @ManyToOne(fetch=FetchType.LAZY)+ @JoinColumn(nullable=false)+ private User user;++ @Column(nullable=false)+ private String type;++ @Column(nullable=false)+ private String source;++ @Column(nullable=false)+ private String description;++ @Column(nullable=false)+ private Date date = new Date();++ public Project getProject() {+ return project;+ }++ public void setProject(Project project) {+ this.project = project;+ }++ public User getUser() {+ return user;+ }++ public void setUser(User user) {+ this.user = user;+ }++ public String getType() {+ return type;+ }++ public void setType(String type) {+ this.type = type;+ }++ public String getSource() {+ return source;+ }++ public void setSource(String source) {+ this.source = source;+ }++ public String getDescription() {+ return description;+ }++ public void setDescription(String description) {+ this.description = description;+ }++ public Date getDate() {+ return date;+ }++ public void setDate(Date date) {+ this.date = date;+ }++}diff --git a/core/src/main/java/io/onedev/server/model/User.java b/core/src/main/java/io/onedev/server/model/User.javaindex 61e7caa9e7..0942880442 100644--- a/core/src/main/java/io/onedev/server/model/User.java+++ b/core/src/main/java/io/onedev/server/model/User.java@@ -89,7 +89,7 @@ public class User extends AbstractEntity implements AuthenticationInfo {private Collection<IssueWatch> issueWatches = new ArrayList<>();@OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)- private Collection<PullRequestTask> requestTasks = new ArrayList<>();+ private Collection<Task> tasks = new ArrayList<>();@OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)private Collection<IssueQuerySetting> issueQuerySettings = new ArrayList<>();@@ -180,12 +180,12 @@ public class User extends AbstractEntity implements AuthenticationInfo {this.memberships = memberships;}- public Collection<PullRequestTask> getRequestTasks() {- return requestTasks;+ public Collection<Task> getTasks() {+ return tasks;}- public void setRequestTasks(Collection<PullRequestTask> requestTasks) {- this.requestTasks = requestTasks;+ public void setTasks(Collection<Task> tasks) {+ this.tasks = tasks;}@SuppressWarnings("deprecation")diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQuery.java b/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQuery.javaindex 31e53c93ef..d1b9201c86 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQuery.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQuery.java@@ -95,7 +95,7 @@ public class IssueQuery implements Serializable {elseorders.add(builder.desc(root.get(Issue.BUILTIN_FIELDS.get(sort.getField()))));} else {- Join<Issue, IssueFieldUnary> join = root.join("fields", JoinType.LEFT);+ Join<Issue, IssueFieldUnary> join = root.join("fieldUnaries", JoinType.LEFT);join.on(builder.equal(join.get(IssueFieldUnary.NAME), sort.getField()));if (sort.getDirection() == Direction.ASCENDING)orders.add(builder.asc(join.get(IssueFieldUnary.ORDINAL)));diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/QueryBuildContext.java b/core/src/main/java/io/onedev/server/model/support/issue/query/QueryBuildContext.javaindex e825c9f54a..1d132912ba 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/QueryBuildContext.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/QueryBuildContext.java@@ -25,7 +25,7 @@ public class QueryBuildContext {public Join<Issue, ?> getJoin(String fieldName) {Join<Issue, ?> join = joins.get(fieldName);if (join == null) {- join = root.join("fields");+ join = root.join("fieldUnaries");join.on(builder.equal(join.get("name"), fieldName));joins.put(fieldName, join);}diff --git a/core/src/main/java/io/onedev/server/web/component/requeststatus/RequestStatusPanel.java b/core/src/main/java/io/onedev/server/web/component/RequestStatusLabel.javasimilarity index 52%rename from core/src/main/java/io/onedev/server/web/component/requeststatus/RequestStatusPanel.javarename to core/src/main/java/io/onedev/server/web/component/RequestStatusLabel.javaindex 37d91d2e68..6e39880412 100644--- a/core/src/main/java/io/onedev/server/web/component/requeststatus/RequestStatusPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/RequestStatusLabel.java@@ -1,30 +1,25 @@-package io.onedev.server.web.component.requeststatus;+package io.onedev.server.web.component;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.CloseInfo;@SuppressWarnings("serial")-public class RequestStatusPanel extends Panel {+public class RequestStatusLabel extends Label {- public RequestStatusPanel(String id, IModel<PullRequest> requestModel) {- super(id, requestModel);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- add(new Label("status", new AbstractReadOnlyModel<String>() {+ private final IModel<PullRequest> requestModel;++ public RequestStatusLabel(String id, IModel<PullRequest> requestModel) {+ super(id, new LoadableDetachableModel<String>() {@Override- public String getObject() {- PullRequest request = getPullRequest();+ protected String load() {+ PullRequest request = requestModel.getObject();CloseInfo closeInfo = request.getCloseInfo();if (closeInfo == null)return "OPEN";@@ -32,24 +27,39 @@ public class RequestStatusPanel extends Panel {return closeInfo.getCloseStatus().toString();}- }).add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {+ });+ this.requestModel = requestModel;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {@Overridepublic String getObject() {PullRequest request = getPullRequest();CloseInfo closeInfo = request.getCloseInfo();if (closeInfo == null)- return "label-warning";+ return "label label-warning request-status";else if (closeInfo.getCloseStatus() == CloseInfo.Status.MERGED)- return "label-success";+ return "label label-success request-status";else- return "label-danger";+ return "label label-danger request-status";}- })));+ }));}private PullRequest getPullRequest() {- return (PullRequest) getDefaultModelObject();+ return requestModel.getObject();+ }++ @Override+ protected void onDetach() {+ requestModel.detach();+ super.onDetach();}+}diff --git a/core/src/main/java/io/onedev/server/web/component/requeststatus/RequestStatusPanel.html b/core/src/main/java/io/onedev/server/web/component/requeststatus/RequestStatusPanel.htmldeleted file mode 100644index 177450c8b7..0000000000--- a/core/src/main/java/io/onedev/server/web/component/requeststatus/RequestStatusPanel.html+++ /dev/null@@ -1,3 +0,0 @@-<wicket:panel>- <span wicket:id="status" class="label"></span>-</wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/component/select2/SelectToAddChoice.java b/core/src/main/java/io/onedev/server/web/component/select2/SelectToAddChoice.javaindex 127c5c7d33..15643e24ea 100644--- a/core/src/main/java/io/onedev/server/web/component/select2/SelectToAddChoice.java+++ b/core/src/main/java/io/onedev/server/web/component/select2/SelectToAddChoice.java@@ -47,7 +47,7 @@ public abstract class SelectToAddChoice<T> extends Select2Choice<T> {onSelect(target, selection);selection = null;}- String script = String.format("$('#%s').select2('data', null);", getMarkupId());+ String script = String.format("setTimeout(function(){$('#%s').select2('data', null);}, 0);", getMarkupId());target.appendJavaScript(script);}diff --git a/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.javaindex df796a8061..06a41c19fe 100644--- a/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java+++ b/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java@@ -142,7 +142,7 @@ public abstract class LayoutPage extends BasePage {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(!getLoginUser().getRequestTasks().isEmpty());+ setVisible(!getLoginUser().getTasks().isEmpty());}}.setOutputMarkupPlaceholderTag(true));diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/issue-list.css b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/issue-list.cssindex 3b96d1662c..e878666c80 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/issue-list.css+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/issue-list.css@@ -6,7 +6,7 @@top: 48px;left: 240px;bottom: 0;- width: 240px;+ width: 300px;padding: 20px;border-right: 2px solid #E0E0E0;overflow: auto;@@ -51,7 +51,7 @@#issue-list>.main {padding: 20px;- margin-left: 240px;+ margin-left: 300px;}#issue-list>.main>.head {position: relative;diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/activity/ReferencedPanel.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/activity/ReferencedPanel.javaindex 99b1f49190..3743db0715 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/activity/ReferencedPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/overview/activity/ReferencedPanel.java@@ -9,10 +9,10 @@ import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReference;import io.onedev.server.model.User;import io.onedev.server.util.DateUtils;+import io.onedev.server.web.component.RequestStatusLabel;import io.onedev.server.web.component.avatar.AvatarLink;import io.onedev.server.web.component.link.UserLink;import io.onedev.server.web.component.link.ViewStateAwarePageLink;-import io.onedev.server.web.component.requeststatus.RequestStatusPanel;import io.onedev.server.web.page.project.pullrequests.requestdetail.overview.RequestOverviewPage;@SuppressWarnings("serial")@@ -39,7 +39,7 @@ class ReferencedPanel extends GenericPanel<PullRequestReference> {link.add(new Label("title", reference.getReferencedBy().getTitle()));add(link);- add(new RequestStatusPanel("status", new AbstractReadOnlyModel<PullRequest>() {+ add(new RequestStatusLabel("status", new AbstractReadOnlyModel<PullRequest>() {@Overridepublic PullRequest getObject() {diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListPage.javaindex b9e373a7a8..fe4abff7ec 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListPage.java@@ -40,6 +40,7 @@ import io.onedev.server.persistence.dao.Dao;import io.onedev.server.persistence.dao.EntityCriteria;import io.onedev.server.util.DateUtils;import io.onedev.server.web.WebConstants;+import io.onedev.server.web.component.RequestStatusLabel;import io.onedev.server.web.component.avatar.AvatarLink;import io.onedev.server.web.component.datatable.HistoryAwarePagingNavigator;import io.onedev.server.web.component.floating.FloatingPanel;@@ -48,7 +49,6 @@ import io.onedev.server.web.component.link.UserLink;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.menu.MenuItem;import io.onedev.server.web.component.menu.MenuLink;-import io.onedev.server.web.component.requeststatus.RequestStatusPanel;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.pullrequests.newrequest.NewRequestPage;@@ -284,7 +284,7 @@ public class RequestListPage extends ProjectPage {});- fragment.add(new RequestStatusPanel("status", rowModel));+ fragment.add(new RequestStatusLabel("status", rowModel));fragment.add(new BranchLink("target", request.getTarget(), null));if (request.getSource() != null) {fragment.add(new BranchLink("source", request.getSource(), request));diff --git a/core/src/main/java/io/onedev/server/web/page/user/TaskListPage.html b/core/src/main/java/io/onedev/server/web/page/user/TaskListPage.htmlindex dce5558ac9..51acd93d8c 100644--- a/core/src/main/java/io/onedev/server/web/page/user/TaskListPage.html+++ b/core/src/main/java/io/onedev/server/web/page/user/TaskListPage.html@@ -1,14 +1,19 @@<wicket:extend>- <div>+ <div id="tasks"><table wicket:id="tasks" class="table table-striped"></table>- <div wicket:id="noTasks" class="alert alert-warning">No tasks found</div><wicket:enclosure child="deleteSelected"><div class="help-block"><i class="fa fa-info-circle"></i> OneDev will remove tasks automatically after you complete them. However you can also <a wicket:id="deleteSelected">delete selected tasks</a> manually here.</div></wicket:enclosure></div>- <wicket:fragment wicket:id="linkFrag">- <a wicket:id="link"></a>+ <wicket:fragment wicket:id="projectFrag">+ <a wicket:id="link"><span wicket:id="label"></span></a>+ </wicket:fragment>+ <wicket:fragment wicket:id="pullRequestFrag">+ <span wicket:id="status"></span> <a wicket:id="link"><span wicket:id="label"></span></a>+ </wicket:fragment>+ <wicket:fragment wicket:id="issueFrag">+ <span wicket:id="state"></span> <a wicket:id="link"><span wicket:id="label"></span></a></wicket:fragment></wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/user/TaskListPage.java b/core/src/main/java/io/onedev/server/web/page/user/TaskListPage.javaindex 6fffc836fb..45873b6608 100644--- a/core/src/main/java/io/onedev/server/web/page/user/TaskListPage.java+++ b/core/src/main/java/io/onedev/server/web/page/user/TaskListPage.java@@ -8,30 +8,36 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColuimport org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;import org.apache.wicket.extensions.markup.html.repeater.util.SortParam;-import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.repeater.Item;import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.hibernate.criterion.Restrictions;import io.onedev.server.OneDev;+import io.onedev.server.manager.IssueManager;+import io.onedev.server.manager.PullRequestManager;import io.onedev.server.model.AbstractEntity;+import io.onedev.server.model.Issue;import io.onedev.server.model.PullRequest;-import io.onedev.server.model.PullRequestTask;+import io.onedev.server.model.Task;import io.onedev.server.persistence.dao.Dao;import io.onedev.server.persistence.dao.EntityCriteria;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.DateUtils;import io.onedev.server.web.WebConstants;+import io.onedev.server.web.component.IssueStateLabel;+import io.onedev.server.web.component.RequestStatusLabel;import io.onedev.server.web.component.datatable.EntityDataProvider;import io.onedev.server.web.component.datatable.HistoryAwareDataTable;import io.onedev.server.web.component.datatable.SelectionColumn;-import io.onedev.server.web.component.link.BranchLink;-import io.onedev.server.web.component.link.ViewStateAwarePageLink;+import io.onedev.server.web.page.project.blob.ProjectBlobPage;+import io.onedev.server.web.page.project.issues.issuedetail.activities.IssueActivitiesPage;import io.onedev.server.web.page.project.pullrequests.requestdetail.overview.RequestOverviewPage;import io.onedev.server.web.util.PagingHistorySupport;@@ -48,8 +54,8 @@ public class TaskListPage extends UserPage {protected void onInitialize() {super.onInitialize();- EntityDataProvider<PullRequestTask> dataProvider = new EntityDataProvider<PullRequestTask>(- PullRequestTask.class, new SortParam<String>("date", false)) {+ EntityDataProvider<Task> dataProvider = new EntityDataProvider<Task>(+ Task.class, new SortParam<String>("date", false)) {@Overrideprotected void restrict(EntityCriteria<? extends AbstractEntity> criteria) {@@ -58,83 +64,97 @@ public class TaskListPage extends UserPage {};- SelectionColumn<PullRequestTask, String> selectionColumn;+ SelectionColumn<Task, String> selectionColumn;- List<IColumn<PullRequestTask, String>> columns = new ArrayList<>();- selectionColumn = new SelectionColumn<PullRequestTask, String>();+ List<IColumn<Task, String>> columns = new ArrayList<>();+ selectionColumn = new SelectionColumn<Task, String>();if (getUser().equals(getLoginUser()))columns.add(selectionColumn);- columns.add(new AbstractColumn<PullRequestTask, String>(Model.of("Pull Request"), "request") {+ columns.add(new AbstractColumn<Task, String>(Model.of("Project"), "project") {@Override- public void populateItem(- Item<ICellPopulator<PullRequestTask>> cellItem,- String componentId, IModel<PullRequestTask> rowModel) {- PullRequestTask task = rowModel.getObject();- Fragment fragment = new Fragment(componentId, "linkFrag", TaskListPage.this);- fragment.add(new ViewStateAwarePageLink<Void>("link", RequestOverviewPage.class,- RequestOverviewPage.paramsOf(task.getRequest())) {-- @Override- public IModel<?> getBody() {- return Model.of(rowModel.getObject().getRequest().getTitle());- }-- });- cellItem.add(fragment);- }-- });- columns.add(new AbstractColumn<PullRequestTask, String>(Model.of("Target Branch")) {-- @Override- public void populateItem(- Item<ICellPopulator<PullRequestTask>> cellItem,- String componentId, IModel<PullRequestTask> rowModel) {- PullRequest request = rowModel.getObject().getRequest();- Fragment fragment = new Fragment(componentId, "linkFrag", TaskListPage.this);- fragment.add(new BranchLink("link", request.getTarget(), null));+ public void populateItem(Item<ICellPopulator<Task>> cellItem, String componentId, IModel<Task> rowModel) {+ Task task = rowModel.getObject();+ Fragment fragment = new Fragment(componentId, "projectFrag", TaskListPage.this);+ BookmarkablePageLink<Void> link = new BookmarkablePageLink<Void>("link",+ ProjectBlobPage.class, ProjectBlobPage.paramsOf(task.getProject()));+ link.add(new Label("label", task.getProject().getName()));+ fragment.add(link);cellItem.add(fragment);}});- columns.add(new AbstractColumn<PullRequestTask, String>(Model.of("Source Branch")) {+ columns.add(new AbstractColumn<Task, String>(Model.of("Source"), null) {@Override- public void populateItem(- Item<ICellPopulator<PullRequestTask>> cellItem,- String componentId, IModel<PullRequestTask> rowModel) {- PullRequest request = rowModel.getObject().getRequest();- if (request.getSource() != null) {- Fragment fragment = new Fragment(componentId, "linkFrag", TaskListPage.this);- fragment.add(new BranchLink("link", request.getSource(), request));- cellItem.add(fragment);+ public void populateItem(Item<ICellPopulator<Task>> cellItem, String componentId, IModel<Task> rowModel) {+ Task task = rowModel.getObject();+ if (task.getType().equals(Task.TYPE_PULLREQUEST)) {+ PullRequest request = OneDev.getInstance(PullRequestManager.class)+ .find(task.getProject(), Long.valueOf(task.getSource()));+ if (request != null) {+ Long requestId = request.getId();+ Fragment fragment = new Fragment(componentId, "pullRequestFrag", TaskListPage.this);+ fragment.add(new RequestStatusLabel("status", new LoadableDetachableModel<PullRequest>() {++ @Override+ protected PullRequest load() {+ return OneDev.getInstance(PullRequestManager.class).load(requestId);+ }++ }));+ Link<Void> link = new BookmarkablePageLink<Void>("link",+ RequestOverviewPage.class, RequestOverviewPage.paramsOf(request));+ link.add(new Label("label", "pull request #" + request.getNumberStr() + ": " + request.getTitle()));+ fragment.add(link);+ cellItem.add(fragment);+ } else {+ cellItem.add(new Label(componentId, "pull request #" + task.getSource()));+ }+ } else if (task.getType().equals(Task.TYPE_ISSUE)) {+ Issue issue = OneDev.getInstance(IssueManager.class)+ .find(task.getProject(), Long.valueOf(task.getSource()));+ if (issue != null) {+ Long issueId = issue.getId();+ Fragment fragment = new Fragment(componentId, "issueFrag", TaskListPage.this);+ fragment.add(new IssueStateLabel("state", new LoadableDetachableModel<Issue>() {++ @Override+ protected Issue load() {+ return OneDev.getInstance(IssueManager.class).load(issueId);+ }++ }));+ Link<Void> link = new BookmarkablePageLink<Void>("link",+ IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(issue, null));+ link.add(new Label("label", "issue #" + issue.getNumberStr() + ": " + issue.getTitle()));+ fragment.add(link);+ cellItem.add(fragment);+ } else {+ cellItem.add(new Label(componentId, "pull request #" + task.getSource()));+ }} else {- cellItem.add(new Label(componentId, request.getSource().getFQN()));+ throw new RuntimeException("Unexpected task type: " + task.getType());}}});- columns.add(new AbstractColumn<PullRequestTask, String>(Model.of("Task"), "type") {+ columns.add(new AbstractColumn<Task, String>(Model.of("Description"), "description") {@Override- public void populateItem(- Item<ICellPopulator<PullRequestTask>> cellItem,- String componentId, IModel<PullRequestTask> rowModel) {- PullRequestTask task = rowModel.getObject();- cellItem.add(new Label(componentId, task.getType().toString()));+ public void populateItem(Item<ICellPopulator<Task>> cellItem, String componentId, IModel<Task> rowModel) {+ Task task = rowModel.getObject();+ cellItem.add(new Label(componentId, task.getDescription()));}});- columns.add(new AbstractColumn<PullRequestTask, String>(Model.of("When"), "date") {+ columns.add(new AbstractColumn<Task, String>(Model.of("When"), "date") {@Override- public void populateItem(- Item<ICellPopulator<PullRequestTask>> cellItem,- String componentId, IModel<PullRequestTask> rowModel) {- PullRequestTask type = rowModel.getObject();- cellItem.add(new Label(componentId, DateUtils.formatAge(type.getDate())));+ public void populateItem(Item<ICellPopulator<Task>> cellItem, String componentId, IModel<Task> rowModel) {+ Task task = rowModel.getObject();+ cellItem.add(new Label(componentId, DateUtils.formatAge(task.getDate())));}});@@ -155,13 +175,10 @@ public class TaskListPage extends UserPage {};- DataTable<PullRequestTask, String> dataTable = new HistoryAwareDataTable<PullRequestTask, String>("tasks", columns,+ DataTable<Task, String> dataTable = new HistoryAwareDataTable<Task, String>("tasks", columns,dataProvider, WebConstants.PAGE_SIZE, pagingHistorySupport);- dataTable.setVisible(dataTable.getRowCount() != 0);add(dataTable);- add(new WebMarkupContainer("noTasks").setVisible(dataTable.getRowCount() == 0));-add(new Link<Void>("deleteSelected") {@Override@@ -169,7 +186,7 @@ public class TaskListPage extends UserPage {if (selectionColumn.getSelections().isEmpty()) {getSession().warn("Please select tasks to delete");} else {- for (IModel<PullRequestTask> model: selectionColumn.getSelections())+ for (IModel<Task> model: selectionColumn.getSelections())OneDev.getInstance(Dao.class).remove(model.getObject());}setResponsePage(TaskListPage.class, TaskListPage.paramsOf(getUser()));diff --git a/core/src/main/java/io/onedev/server/web/page/user/user.css b/core/src/main/java/io/onedev/server/web/page/user/user.cssindex 18d0c01dec..0a7245acea 100644--- a/core/src/main/java/io/onedev/server/web/page/user/user.css+++ b/core/src/main/java/io/onedev/server/web/page/user/user.css@@ -51,4 +51,8 @@.token-generate .token-value a {color: #444;margin-left: 4px;+}++#tasks {+}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/websocket/TaskEventBroadcaster.java b/core/src/main/java/io/onedev/server/web/websocket/TaskEventBroadcaster.javaindex 3e6cbe11d8..a66979bdde 100644--- a/core/src/main/java/io/onedev/server/web/websocket/TaskEventBroadcaster.java+++ b/core/src/main/java/io/onedev/server/web/websocket/TaskEventBroadcaster.java@@ -4,7 +4,7 @@ import javax.inject.Inject;import javax.inject.Singleton;import io.onedev.launcher.loader.Listen;-import io.onedev.server.model.PullRequestTask;+import io.onedev.server.model.Task;import io.onedev.server.model.User;import io.onedev.server.persistence.dao.EntityPersisted;import io.onedev.server.persistence.dao.EntityRemoved;@@ -21,16 +21,16 @@ public class TaskEventBroadcaster {@Listenpublic void on(EntityPersisted event) {- if (event.getEntity() instanceof PullRequestTask) {- PullRequestTask task = (PullRequestTask) event.getEntity();+ if (event.getEntity() instanceof Task) {+ Task task = (Task) event.getEntity();webSocketManager.onObservableChanged(User.getWebSocketObservable(task.getUser().getId()), null);}}@Listenpublic void on(EntityRemoved event) {- if (event.getEntity() instanceof PullRequestTask) {- PullRequestTask task = (PullRequestTask) event.getEntity();+ if (event.getEntity() instanceof Task) {+ Task task = (Task) event.getEntity();webSocketManager.onObservableChanged(User.getWebSocketObservable(task.getUser().getId()), null);}}