The Unified and Autonomous Development Platform
Global pull request list
Robin Shenf5fc45f6d998
diff --git a/server-core/pom.xml b/server-core/pom.xmlindex 69c6de2b0a..6122611a5e 100644--- a/server-core/pom.xml+++ b/server-core/pom.xml@@ -45,6 +45,11 @@<artifactId>commons-codec</artifactId><version>1.7</version></dependency>+ <dependency>+ <groupId>org.apache.commons</groupId>+ <artifactId>commons-compress</artifactId>+ <version>1.18</version>+ </dependency><dependency><groupId>org.jetbrains.xodus</groupId><artifactId>xodus-entity-store</artifactId>@@ -58,7 +63,7 @@<dependency><groupId>com.google.guava</groupId><artifactId>guava</artifactId>- <version>20.0</version>+ <version>25.1-android</version></dependency><dependency><groupId>org.apache.commons</groupId>diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.javaindex 1257a5ac52..5a3b8d4189 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.java@@ -26,13 +26,13 @@ public interface IssueManager extends EntityManager<Issue> {void open(Issue issue);- List<Issue> query(@Nullable Project project, User user, EntityQuery<Issue> issueQuery, int firstResult, int maxResults);+ List<Issue> query(@Nullable Project project, @Nullable User user, EntityQuery<Issue> issueQuery, int firstResult, int maxResults);- int count(@Nullable Project project, User user, @Nullable IssueCriteria issueCriteria);+ int count(@Nullable Project project, @Nullable User user, @Nullable IssueCriteria issueCriteria);List<Issue> query(Project project, @Nullable String term, int count);- int count(Milestone milestone, User user, @Nullable StateSpec.Category category);+ int count(Milestone milestone, @Nullable User user, @Nullable StateSpec.Category category);Collection<String> getUndefinedStates();diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.javaindex d5d3ef9686..503ab5e44d 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/ProjectManager.java@@ -4,6 +4,7 @@ import java.util.Collection;import javax.annotation.Nullable;+import org.apache.shiro.authz.Permission;import org.eclipse.jgit.lib.Repository;import io.onedev.server.model.Project;@@ -41,6 +42,6 @@ public interface ProjectManager extends EntityManager<Project> {Repository getRepository(Project project);- Collection<Project> getAccessibleProjects(@Nullable User user);+ Collection<Project> getPermittedProjects(@Nullable User user, Permission permission);}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.javaindex 5426751279..0114c0da5f 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestManager.java@@ -59,7 +59,8 @@ public interface PullRequestManager extends EntityManager<PullRequest> {void open(PullRequest request);- PullRequest open(ProjectAndBranch source, ProjectAndBranch target, MergeStrategy mergeStrategy, User submitter, String title);+ PullRequest open(ProjectAndBranch source, ProjectAndBranch target,+ MergeStrategy mergeStrategy, User submitter, String title);void delete(PullRequest request);@@ -71,9 +72,11 @@ public interface PullRequestManager extends EntityManager<PullRequest> {void checkQuality(PullRequest request);- List<PullRequest> query(Project targetProject, User user, EntityQuery<PullRequest> requestQuery, int firstResult, int maxResults);+ List<PullRequest> query(@Nullable Project targetProject, @Nullable User user,+ EntityQuery<PullRequest> requestQuery, int firstResult, int maxResults);- int count(Project targetProject, User user, EntityCriteria<PullRequest> requestCriteria);+ int count(@Nullable Project targetProject, @Nullable User user,+ EntityCriteria<PullRequest> requestCriteria);List<PullRequest> query(Project targetProject, String term, int count);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/SettingManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/SettingManager.javaindex a7746c5942..272d070a87 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/SettingManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/SettingManager.java@@ -6,9 +6,11 @@ import javax.annotation.Nullable;import io.onedev.server.model.Setting;import io.onedev.server.model.support.administration.BackupSetting;-import io.onedev.server.model.support.administration.IssueSetting;+import io.onedev.server.model.support.administration.BuildSetting;import io.onedev.server.model.support.administration.GroovyScript;+import io.onedev.server.model.support.administration.IssueSetting;import io.onedev.server.model.support.administration.MailSetting;+import io.onedev.server.model.support.administration.PullRequestSetting;import io.onedev.server.model.support.administration.SecuritySetting;import io.onedev.server.model.support.administration.SystemSetting;import io.onedev.server.model.support.administration.authenticator.Authenticator;@@ -110,4 +112,12 @@ public interface SettingManager extends EntityManager<Setting> {void saveGroovyScripts(List<GroovyScript> jobScripts);+ PullRequestSetting getPullRequestSetting();++ void savePullRequestSetting(PullRequestSetting pullRequestSetting);++ BuildSetting getBuildSetting();++ void saveBuildSetting(BuildSetting buildSetting);+}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildQuerySettingManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildQuerySettingManager.javaindex 1acb28c193..51f5440030 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildQuerySettingManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildQuerySettingManager.java@@ -40,7 +40,7 @@ public class DefaultBuildQuerySettingManager extends AbstractEntityManager<Buildsetting.getQuerySubscriptionSupport().getUserQuerySubscriptions().retainAll(setting.getUserQueries().stream().map(it->it.getName()).collect(Collectors.toSet()));setting.getQuerySubscriptionSupport().getQuerySubscriptions().retainAll(- setting.getProject().getNamedBuildQueries().stream().map(it->it.getName()).collect(Collectors.toSet()));+ setting.getProject().getBuildSetting().getNamedQueries(true).stream().map(it->it.getName()).collect(Collectors.toSet()));if (setting.getQuerySubscriptionSupport().getQuerySubscriptions().isEmpty() && setting.getUserQueries().isEmpty()) {if (!setting.isNew())delete(setting);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.javaindex f2fa8e2705..0e15adcbc5 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@@ -69,6 +69,7 @@ import io.onedev.server.search.entity.issue.AndCriteria;import io.onedev.server.search.entity.issue.IssueCriteria;import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.search.entity.issue.MilestoneCriteria;+import io.onedev.server.security.permission.AccessProject;import io.onedev.server.util.IssueConstants;import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.ValueSetEdit;@@ -174,13 +175,13 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements}private Predicate[] getPredicates(io.onedev.server.search.entity.EntityCriteria<Issue> criteria,- @Nullable Project project, Root<Issue> root, CriteriaBuilder builder, User user) {+ @Nullable Project project, Root<Issue> root, CriteriaBuilder builder, @Nullable User user) {List<Predicate> predicates = new ArrayList<>();if (project != null) {predicates.add(builder.equal(root.get("project"), project));} else if (!SecurityUtils.isAdministrator()) {List<Predicate> projectPredicates = new ArrayList<>();- for (Project each: projectManager.getAccessibleProjects(user))+ for (Project each: projectManager.getPermittedProjects(user, new AccessProject()))projectPredicates.add(builder.equal(root.get(IssueConstants.ATTR_PROJECT), each));predicates.add(builder.or(projectPredicates.toArray(new Predicate[projectPredicates.size()])));}@@ -189,7 +190,8 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementsreturn predicates.toArray(new Predicate[0]);}- private CriteriaQuery<Issue> buildCriteriaQuery(Session session, Project project, EntityQuery<Issue> issueQuery, User user) {+ private CriteriaQuery<Issue> buildCriteriaQuery(Session session, @Nullable Project project,+ EntityQuery<Issue> issueQuery, @Nullable User user) {CriteriaBuilder builder = session.getCriteriaBuilder();CriteriaQuery<Issue> query = builder.createQuery(Issue.class);Root<Issue> root = query.from(Issue.class);@@ -226,8 +228,8 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements@Sessional@Override- public List<Issue> query(@Nullable Project project, User user, io.onedev.server.search.entity.EntityQuery<Issue> issueQuery,- int firstResult, int maxResults) {+ public List<Issue> query(@Nullable Project project, @Nullable User user,+ io.onedev.server.search.entity.EntityQuery<Issue> issueQuery, int firstResult, int maxResults) {CriteriaQuery<Issue> criteriaQuery = buildCriteriaQuery(getSession(), project, issueQuery, user);Query<Issue> query = getSession().createQuery(criteriaQuery);query.setFirstResult(firstResult);@@ -248,7 +250,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements@Sessional@Override- public int count(@Nullable Project project, User user, IssueCriteria issueCriteria) {+ public int count(@Nullable Project project, @Nullable User user, IssueCriteria issueCriteria) {CriteriaBuilder builder = getSession().getCriteriaBuilder();CriteriaQuery<Long> criteriaQuery = builder.createQuery(Long.class);Root<Issue> root = criteriaQuery.from(Issue.class);@@ -260,7 +262,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements}@Override- public int count(Milestone milestone, User user, @Nullable StateSpec.Category category) {+ public int count(Milestone milestone, @Nullable User user, @Nullable StateSpec.Category category) {if (category != null) {IssueCriteria criteria = getIssueSetting().getCategoryCriteria(category);if (criteria != null) {@@ -347,7 +349,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements@Sessional@Override- public List<Issue> query(Project project, String term, int count) {+ public List<Issue> query(Project project, @Nullable String term, int count) {List<Issue> issues = new ArrayList<>();EntityCriteria<Issue> criteria = newCriteria();diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.javaindex 8b95f7c628..094d233732 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java@@ -15,6 +15,7 @@ import javax.inject.Inject;import javax.inject.Singleton;import org.apache.commons.io.IOUtils;+import org.apache.shiro.authz.Permission;import org.eclipse.jgit.api.Git;import org.eclipse.jgit.api.errors.GitAPIException;import org.eclipse.jgit.diff.DiffAlgorithm.SupportedAlgorithm;@@ -35,7 +36,6 @@ import io.onedev.commons.launcher.loader.ListenerRegistry;import io.onedev.commons.utils.ExceptionUtils;import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.StringUtils;-import io.onedev.server.OneDev;import io.onedev.server.cache.CommitInfoManager;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.GroupManager;@@ -407,24 +407,30 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem}@Override- public Collection<Project> getAccessibleProjects(User user) {+ public Collection<Project> getPermittedProjects(User user, Permission permission) {Collection<Project> projects = new HashSet<>();if (SecurityUtils.isAdministrator()) {- projects.addAll(OneDev.getInstance(ProjectManager.class).query());+ projects.addAll(query());} else {if (user != null) {for (Membership membership: user.getMemberships()) {- for (GroupAuthorization authorization: membership.getGroup().getProjectAuthorizations())+ for (GroupAuthorization authorization: membership.getGroup().getProjectAuthorizations()) {+ if (authorization.getRole().implies(permission))+ projects.add(authorization.getProject());+ }+ }+ for (UserAuthorization authorization: user.getProjectAuthorizations()) {+ if (authorization.getRole().implies(permission))projects.add(authorization.getProject());}- for (UserAuthorization authorization: user.getProjectAuthorizations())- projects.add(authorization.getProject());}Group group = groupManager.findAnonymous();if (group != null) {- for (GroupAuthorization authorization: group.getProjectAuthorizations())- projects.add(authorization.getProject());+ for (GroupAuthorization authorization: group.getProjectAuthorizations()) {+ if (authorization.getRole().implies(permission))+ projects.add(authorization.getProject());+ }}}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.javaindex e98527ee49..4d15b6a1d8 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@@ -22,6 +22,7 @@ import java.util.Map;import java.util.Set;import java.util.stream.Collectors;+import javax.annotation.Nullable;import javax.inject.Inject;import javax.inject.Singleton;import javax.persistence.criteria.CriteriaBuilder;@@ -122,6 +123,7 @@ import io.onedev.server.search.entity.EntitySort;import io.onedev.server.search.entity.EntitySort.Direction;import io.onedev.server.search.entity.pullrequest.PullRequestQuery;import io.onedev.server.security.permission.ProjectPermission;+import io.onedev.server.security.permission.ReadCode;import io.onedev.server.security.permission.WriteCode;import io.onedev.server.util.PullRequestConstants;import io.onedev.server.util.SecurityUtils;@@ -950,16 +952,24 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest}private Predicate[] getPredicates(io.onedev.server.search.entity.EntityCriteria<PullRequest> criteria,- Project targetProject, User user, Root<PullRequest> root, CriteriaBuilder builder) {+ @Nullable Project targetProject, @Nullable User user, Root<PullRequest> root, CriteriaBuilder builder) {List<Predicate> predicates = new ArrayList<>();- predicates.add(builder.equal(root.get("targetProject"), targetProject));+ if (targetProject != null) {+ predicates.add(builder.equal(root.get("targetProject"), targetProject));+ } else if (!SecurityUtils.isAdministrator()) {+ List<Predicate> targetProjectPredicates = new ArrayList<>();+ for (Project each: projectManager.getPermittedProjects(user, new ReadCode()))+ targetProjectPredicates.add(builder.equal(root.get(PullRequestConstants.ATTR_TARGET_PROJECT), each));+ predicates.add(builder.or(targetProjectPredicates.toArray(new Predicate[targetProjectPredicates.size()])));+ }+if (criteria != null)predicates.add(criteria.getPredicate(targetProject, root, builder, user));return predicates.toArray(new Predicate[0]);}- private CriteriaQuery<PullRequest> buildCriteriaQuery(Session session, Project targetProject, User user,- EntityQuery<PullRequest> requestQuery) {+ private CriteriaQuery<PullRequest> buildCriteriaQuery(Session session, @Nullable Project targetProject,+ User user, EntityQuery<PullRequest> requestQuery) {CriteriaBuilder builder = session.getCriteriaBuilder();CriteriaQuery<PullRequest> query = builder.createQuery(PullRequest.class);Root<PullRequest> root = query.from(PullRequest.class);@@ -984,7 +994,8 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest@Sessional@Override- public List<PullRequest> query(Project targetProject, User user, EntityQuery<PullRequest> requestQuery, int firstResult, int maxResults) {+ public List<PullRequest> query(@Nullable Project targetProject, @Nullable User user,+ EntityQuery<PullRequest> requestQuery, int firstResult, int maxResults) {CriteriaQuery<PullRequest> criteriaQuery = buildCriteriaQuery(getSession(), targetProject, user, requestQuery);Query<PullRequest> query = getSession().createQuery(criteriaQuery);query.setFirstResult(firstResult);@@ -994,7 +1005,8 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest@Sessional@Override- public int count(Project targetProject, User user, io.onedev.server.search.entity.EntityCriteria<PullRequest> requestCriteria) {+ public int count(@Nullable Project targetProject, @Nullable User user,+ io.onedev.server.search.entity.EntityCriteria<PullRequest> requestCriteria) {CriteriaBuilder builder = getSession().getCriteriaBuilder();CriteriaQuery<Long> criteriaQuery = builder.createQuery(Long.class);Root<PullRequest> root = criteriaQuery.from(PullRequest.class);@@ -1053,7 +1065,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest@Sessional@Override- public List<PullRequest> query(Project targetProject, String term, int count) {+ public List<PullRequest> query(Project targetProject, @Nullable String term, int count) {List<PullRequest> requests = new ArrayList<>();EntityCriteria<PullRequest> criteria = newCriteria();diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.javaindex 3cdae4906b..da59874a0c 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java@@ -15,9 +15,11 @@ import io.onedev.server.maintenance.DataManager;import io.onedev.server.model.Setting;import io.onedev.server.model.Setting.Key;import io.onedev.server.model.support.administration.BackupSetting;-import io.onedev.server.model.support.administration.IssueSetting;+import io.onedev.server.model.support.administration.BuildSetting;import io.onedev.server.model.support.administration.GroovyScript;+import io.onedev.server.model.support.administration.IssueSetting;import io.onedev.server.model.support.administration.MailSetting;+import io.onedev.server.model.support.administration.PullRequestSetting;import io.onedev.server.model.support.administration.SecuritySetting;import io.onedev.server.model.support.administration.SystemSetting;import io.onedev.server.model.support.administration.authenticator.Authenticator;@@ -49,6 +51,10 @@ public class DefaultSettingManager extends AbstractEntityManager<Setting> implemprivate volatile Long jobScriptsId;+ private volatile Long pullRequestSettingId;++ private volatile Long buildSettingId;+@Injectpublic DefaultSettingManager(Dao dao, DataManager dataManager) {super(dao);@@ -276,4 +282,56 @@ public class DefaultSettingManager extends AbstractEntityManager<Setting> implemdao.persist(setting);}+ @Sessional+ @Override+ public PullRequestSetting getPullRequestSetting() {+ Setting setting;+ if (pullRequestSettingId == null) {+ setting = getSetting(Key.PULL_REQUEST);+ Preconditions.checkNotNull(setting);+ pullRequestSettingId = setting.getId();+ } else {+ setting = load(pullRequestSettingId);+ }+ return (PullRequestSetting)setting.getValue();+ }++ @Transactional+ @Override+ public void savePullRequestSetting(PullRequestSetting pullRequestSetting) {+ Setting setting = getSetting(Key.PULL_REQUEST);+ if (setting == null) {+ setting = new Setting();+ setting.setKey(Key.PULL_REQUEST);+ }+ setting.setValue(pullRequestSetting);+ dao.persist(setting);+ }++ @Sessional+ @Override+ public BuildSetting getBuildSetting() {+ Setting setting;+ if (buildSettingId == null) {+ setting = getSetting(Key.BUILD);+ Preconditions.checkNotNull(setting);+ buildSettingId = setting.getId();+ } else {+ setting = load(buildSettingId);+ }+ return (BuildSetting)setting.getValue();+ }++ @Transactional+ @Override+ public void saveBuildSetting(BuildSetting buildSetting) {+ Setting setting = getSetting(Key.BUILD);+ if (setting == null) {+ setting = new Setting();+ setting.setKey(Key.BUILD);+ }+ setting.setValue(buildSetting);+ dao.persist(setting);+ }+}diff --git a/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java b/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.javaindex cd2807bc4e..cf731209b2 100644--- a/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java+++ b/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java@@ -41,8 +41,10 @@ import io.onedev.server.model.Setting;import io.onedev.server.model.Setting.Key;import io.onedev.server.model.User;import io.onedev.server.model.support.administration.BackupSetting;+import io.onedev.server.model.support.administration.BuildSetting;import io.onedev.server.model.support.administration.IssueSetting;import io.onedev.server.model.support.administration.MailSetting;+import io.onedev.server.model.support.administration.PullRequestSetting;import io.onedev.server.model.support.administration.SecuritySetting;import io.onedev.server.model.support.administration.SystemSetting;import io.onedev.server.model.support.administration.jobexecutor.AutoDiscoveredJobExecutor;@@ -207,6 +209,14 @@ public class DefaultDataManager implements DataManager, Serializable {if (setting == null) {settingManager.saveGroovyScripts(Lists.newArrayList());}+ setting = settingManager.getSetting(Key.PULL_REQUEST);+ if (setting == null) {+ settingManager.savePullRequestSetting(new PullRequestSetting());+ }+ setting = settingManager.getSetting(Key.BUILD);+ if (setting == null) {+ settingManager.saveBuildSetting(new BuildSetting());+ }setting = settingManager.getSetting(Key.MAIL);if (setting == null) {diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.javaindex 0d6f06f324..973cab732b 100644--- a/server-core/src/main/java/io/onedev/server/model/Project.java+++ b/server-core/src/main/java/io/onedev/server/model/Project.java@@ -101,16 +101,15 @@ import io.onedev.server.git.exception.ObjectNotFoundException;import io.onedev.server.migration.VersionedDocument;import io.onedev.server.model.Build.Status;import io.onedev.server.model.support.BranchProtection;-import io.onedev.server.model.support.BuildSetting;import io.onedev.server.model.support.CommitMessageTransform;-import io.onedev.server.model.support.NamedBuildQuery;import io.onedev.server.model.support.NamedCodeCommentQuery;import io.onedev.server.model.support.NamedCommitQuery;+import io.onedev.server.model.support.ProjectBuildSetting;import io.onedev.server.model.support.Secret;import io.onedev.server.model.support.TagProtection;import io.onedev.server.model.support.WebHook;import io.onedev.server.model.support.issue.ProjectIssueSetting;-import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;+import io.onedev.server.model.support.pullrequest.ProjectPullRequestSetting;import io.onedev.server.persistence.SessionManager;import io.onedev.server.persistence.TransactionManager;import io.onedev.server.storage.StorageManager;@@ -259,7 +258,12 @@ public class Project extends AbstractEntity {@Lob@Column(length=65535, nullable=false)@JsonView(DefaultView.class)- private BuildSetting buildSetting = new BuildSetting();+ private ProjectBuildSetting buildSetting = new ProjectBuildSetting();++ @Lob+ @Column(length=65535, nullable=false)+ @JsonView(DefaultView.class)+ private ProjectPullRequestSetting pullRequestSetting = new ProjectPullRequestSetting();@Lob@Column(length=65535, nullable=false)@@ -273,23 +277,6 @@ public class Project extends AbstractEntity {namedCommitQueries.add(new NamedCommitQuery("Committed recently", "after(last week)"));}- @Lob- @Column(length=65535, nullable=false)- @JsonView(DefaultView.class)- private ArrayList<NamedPullRequestQuery> namedPullRequestQueries = new ArrayList<>();- {- namedPullRequestQueries.add(new NamedPullRequestQuery("Open", "open"));- namedPullRequestQueries.add(new NamedPullRequestQuery("To be reviewed by me", "to be reviewed by me"));- namedPullRequestQueries.add(new NamedPullRequestQuery("To be changed by me", "submitted by me and someone requested for changes"));- namedPullRequestQueries.add(new NamedPullRequestQuery("Request for changes by me", "requested for changes by me"));- namedPullRequestQueries.add(new NamedPullRequestQuery("Approved by me", "approved by me"));- namedPullRequestQueries.add(new NamedPullRequestQuery("Submitted by me", "submitted by me"));- namedPullRequestQueries.add(new NamedPullRequestQuery("Submitted recently", "\"Submit Date\" is after \"last week\""));- namedPullRequestQueries.add(new NamedPullRequestQuery("Updated recently", "\"Update Date\" is after \"last week\""));- namedPullRequestQueries.add(new NamedPullRequestQuery("Closed", "merged or discarded"));- namedPullRequestQueries.add(new NamedPullRequestQuery("All", "all"));- }-@Lob@Column(length=65535, nullable=false)@JsonView(DefaultView.class)@@ -301,24 +288,6 @@ public class Project extends AbstractEntity {namedCodeCommentQueries.add(new NamedCodeCommentQuery("Updated recently", "\"Update Date\" is after \"last week\""));}- @Lob- @Column(length=65535, nullable=false)- @JsonView(DefaultView.class)- private ArrayList<NamedBuildQuery> namedBuildQueries = new ArrayList<>();- {- namedBuildQueries.add(new NamedBuildQuery("All", "all"));- namedBuildQueries.add(new NamedBuildQuery("Successful", "successful"));- namedBuildQueries.add(new NamedBuildQuery("Failed", "failed"));- namedBuildQueries.add(new NamedBuildQuery("Failed eventually", "failed and not(will retry)"));- namedBuildQueries.add(new NamedBuildQuery("In error", "in error"));- namedBuildQueries.add(new NamedBuildQuery("Cancelled", "cancelled"));- namedBuildQueries.add(new NamedBuildQuery("Timed out", "timed out"));- namedBuildQueries.add(new NamedBuildQuery("Running", "running"));- namedBuildQueries.add(new NamedBuildQuery("Waiting", "waiting"));- namedBuildQueries.add(new NamedBuildQuery("Queueing", "queueing"));- namedBuildQueries.add(new NamedBuildQuery("Build recently", "\"Submit Date\" is after \"last week\""));- }-@Lob@Column(length=65535, nullable=false)@JsonView(DefaultView.class)@@ -1041,14 +1010,22 @@ public class Project extends AbstractEntity {this.issueSetting = issueSetting;}- public BuildSetting getBuildSetting() {+ public ProjectBuildSetting getBuildSetting() {return buildSetting;}- public void setBuildSetting(BuildSetting buildSetting) {+ public void setBuildSetting(ProjectBuildSetting buildSetting) {this.buildSetting = buildSetting;}+ public ProjectPullRequestSetting getPullRequestSetting() {+ return pullRequestSetting;+ }++ public void setPullRequestSetting(ProjectPullRequestSetting pullRequestSetting) {+ this.pullRequestSetting = pullRequestSetting;+ }+public ArrayList<NamedCommitQuery> getNamedCommitQueries() {return namedCommitQueries;}@@ -1056,15 +1033,7 @@ public class Project extends AbstractEntity {public void setNamedCommitQueries(ArrayList<NamedCommitQuery> namedCommitQueries) {this.namedCommitQueries = namedCommitQueries;}-- public ArrayList<NamedPullRequestQuery> getNamedPullRequestQueries() {- return namedPullRequestQueries;- }- public void setNamedPullRequestQueries(ArrayList<NamedPullRequestQuery> namedPullRequestQueries) {- this.namedPullRequestQueries = namedPullRequestQueries;- }-public ArrayList<NamedCodeCommentQuery> getNamedCodeCommentQueries() {return namedCodeCommentQueries;}@@ -1073,14 +1042,6 @@ public class Project extends AbstractEntity {this.namedCodeCommentQueries = namedCodeCommentQueries;}- public ArrayList<NamedBuildQuery> getNamedBuildQueries() {- return namedBuildQueries;- }-- public void setNamedBuildQueries(ArrayList<NamedBuildQuery> namedBuildQueries) {- this.namedBuildQueries = namedBuildQueries;- }-public Collection<IssueQuerySetting> getUserIssueQuerySettings() {return userIssueQuerySettings;}diff --git a/server-core/src/main/java/io/onedev/server/model/Setting.java b/server-core/src/main/java/io/onedev/server/model/Setting.javaindex ecf120ae40..aef6044d4f 100644--- a/server-core/src/main/java/io/onedev/server/model/Setting.java+++ b/server-core/src/main/java/io/onedev/server/model/Setting.java@@ -23,7 +23,7 @@ public class Setting extends AbstractEntity {private static final long serialVersionUID = 1L;- public enum Key {SYSTEM, MAIL, BACKUP, SECURITY, AUTHENTICATOR, ISSUE, JOB_EXECUTORS, JOB_SCRIPTS};+ public enum Key {SYSTEM, MAIL, BACKUP, SECURITY, AUTHENTICATOR, ISSUE, JOB_EXECUTORS, JOB_SCRIPTS, PULL_REQUEST, BUILD};/** Optimistic lock is necessary to ensure database integrity when updatediff --git a/server-core/src/main/java/io/onedev/server/model/User.java b/server-core/src/main/java/io/onedev/server/model/User.javaindex d85a062217..62e067c9d6 100644--- a/server-core/src/main/java/io/onedev/server/model/User.java+++ b/server-core/src/main/java/io/onedev/server/model/User.java@@ -3,6 +3,7 @@ package io.onedev.server.model;import java.util.ArrayList;import java.util.Collection;import java.util.LinkedHashMap;+import java.util.LinkedHashSet;import java.util.stream.Collectors;import javax.annotation.Nullable;@@ -33,8 +34,10 @@ import com.google.common.base.Preconditions;import io.onedev.commons.launcher.loader.AppLoader;import io.onedev.commons.utils.matchscore.MatchScoreUtils;+import io.onedev.server.model.support.NamedBuildQuery;import io.onedev.server.model.support.QuerySetting;import io.onedev.server.model.support.issue.NamedIssueQuery;+import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;import io.onedev.server.util.jackson.DefaultView;import io.onedev.server.util.validation.annotation.UserName;import io.onedev.server.util.watch.QuerySubscriptionSupport;@@ -114,16 +117,30 @@ public class User extends AbstractEntity implements AuthenticationInfo {@Column(nullable=false, length=65535)private LinkedHashMap<String, Boolean> issueQueryWatches = new LinkedHashMap<>();- private transient Collection<Group> groups;-- public void setUserQueryWatches(LinkedHashMap<String, Boolean> userQueryWatches) {- this.userIssueQueryWatches = userQueryWatches;- }+ @Lob+ @Column(nullable=false, length=65535)+ private ArrayList<NamedPullRequestQuery> userPullRequestQueries = new ArrayList<>();- public void setQueryWatches(LinkedHashMap<String, Boolean> queryWatches) {- this.issueQueryWatches = queryWatches;- }+ @Lob+ @Column(nullable=false, length=65535)+ private LinkedHashMap<String, Boolean> userPullRequestQueryWatches = new LinkedHashMap<>();++ @Column(nullable=false, length=65535)+ private LinkedHashMap<String, Boolean> pullRequestQueryWatches = new LinkedHashMap<>();++ @Lob+ @Column(nullable=false, length=65535)+ private ArrayList<NamedBuildQuery> userBuildQueries = new ArrayList<>();+ @Lob+ @Column(nullable=false, length=65535)+ private LinkedHashSet<String> userBuildQuerySubscriptions = new LinkedHashSet<>();++ @Column(nullable=false, length=65535)+ private LinkedHashSet<String> buildQuerySubscriptions = new LinkedHashSet<>();++ private transient Collection<Group> groups;+public QuerySetting<NamedIssueQuery> getIssueQuerySetting() {return new QuerySetting<NamedIssueQuery>() {@@ -144,7 +161,7 @@ public class User extends AbstractEntity implements AuthenticationInfo {@Overridepublic void setUserQueries(ArrayList<NamedIssueQuery> userQueries) {- User.this.userIssueQueries = userQueries;+ userIssueQueries = userQueries;}@Override@@ -172,7 +189,121 @@ public class User extends AbstractEntity implements AuthenticationInfo {};}- @Override+ public void setBuildQuerySetting(QuerySetting<NamedBuildQuery> querySetting) {+ buildQuerySubscriptions = querySetting.getQuerySubscriptionSupport().getQuerySubscriptions();+ userBuildQuerySubscriptions = querySetting.getQuerySubscriptionSupport().getUserQuerySubscriptions();+ userBuildQueries = querySetting.getUserQueries();+ }++ public void setIssueQuerySetting(QuerySetting<NamedIssueQuery> querySetting) {+ issueQueryWatches = querySetting.getQueryWatchSupport().getQueryWatches();+ userIssueQueryWatches = querySetting.getQueryWatchSupport().getUserQueryWatches();+ userIssueQueries = querySetting.getUserQueries();+ }++ public void setPullRequestQuerySetting(QuerySetting<NamedPullRequestQuery> querySetting) {+ pullRequestQueryWatches = querySetting.getQueryWatchSupport().getQueryWatches();+ userPullRequestQueryWatches = querySetting.getQueryWatchSupport().getUserQueryWatches();+ userPullRequestQueries = querySetting.getUserQueries();+ }++ public QuerySetting<NamedPullRequestQuery> getPullRequestQuerySetting() {+ return new QuerySetting<NamedPullRequestQuery>() {++ @Override+ public Project getProject() {+ return null;+ }++ @Override+ public User getUser() {+ return User.this;+ }++ @Override+ public ArrayList<NamedPullRequestQuery> getUserQueries() {+ return userPullRequestQueries;+ }++ @Override+ public void setUserQueries(ArrayList<NamedPullRequestQuery> userQueries) {+ userPullRequestQueries = userQueries;+ }++ @Override+ public QueryWatchSupport<NamedPullRequestQuery> getQueryWatchSupport() {+ return new QueryWatchSupport<NamedPullRequestQuery>() {++ @Override+ public LinkedHashMap<String, Boolean> getUserQueryWatches() {+ return userPullRequestQueryWatches;+ }++ @Override+ public LinkedHashMap<String, Boolean> getQueryWatches() {+ return pullRequestQueryWatches;+ }++ };+ }++ @Override+ public QuerySubscriptionSupport<NamedPullRequestQuery> getQuerySubscriptionSupport() {+ return null;+ }++ };+ }++ public QuerySetting<NamedBuildQuery> getBuildQuerySetting() {+ return new QuerySetting<NamedBuildQuery>() {++ @Override+ public Project getProject() {+ return null;+ }++ @Override+ public User getUser() {+ return User.this;+ }++ @Override+ public ArrayList<NamedBuildQuery> getUserQueries() {+ return userBuildQueries;+ }++ @Override+ public void setUserQueries(ArrayList<NamedBuildQuery> userQueries) {+ userBuildQueries = userQueries;+ }++ @Override+ public QueryWatchSupport<NamedBuildQuery> getQueryWatchSupport() {+ return null;+ }++ @Override+ public QuerySubscriptionSupport<NamedBuildQuery> getQuerySubscriptionSupport() {+ return new QuerySubscriptionSupport<NamedBuildQuery>() {++ @Override+ public LinkedHashSet<String> getUserQuerySubscriptions() {+ return userBuildQuerySubscriptions;+ }++ @Override+ public LinkedHashSet<String> getQuerySubscriptions() {+ return buildQuerySubscriptions;+ }++ };+ }++ };+ }++ @Overridepublic PrincipalCollection getPrincipals() {return new SimplePrincipalCollection(getId(), "");}diff --git a/server-core/src/main/java/io/onedev/server/model/support/BuildSetting.java b/server-core/src/main/java/io/onedev/server/model/support/BuildSetting.javadeleted file mode 100644index 7edf7f446e..0000000000--- a/server-core/src/main/java/io/onedev/server/model/support/BuildSetting.java+++ /dev/null@@ -1,29 +0,0 @@-package io.onedev.server.model.support;--import java.io.Serializable;--import org.hibernate.validator.constraints.NotEmpty;--import io.onedev.server.web.editable.annotation.BuildQuery;-import io.onedev.server.web.editable.annotation.Editable;--@Editable-public class BuildSetting implements Serializable {-- private static final long serialVersionUID = 1L;-- private String buildsToPreserve = "all";-- @Editable(description="Specify builds to preserve. OneDev will run every night to remove builds not matching "- + "query specified here")- @BuildQuery(noLoginSupport=true)- @NotEmpty- public String getBuildsToPreserve() {- return buildsToPreserve;- }-- public void setBuildsToPreserve(String buildsToPreserve) {- this.buildsToPreserve = buildsToPreserve;- }--}diff --git a/server-core/src/main/java/io/onedev/server/model/support/ProjectBuildSetting.java b/server-core/src/main/java/io/onedev/server/model/support/ProjectBuildSetting.javanew file mode 100644index 0000000000..9b809c7fb9--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/ProjectBuildSetting.java@@ -0,0 +1,67 @@+package io.onedev.server.model.support;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;++import javax.annotation.Nullable;++import org.hibernate.validator.constraints.NotEmpty;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.model.support.administration.BuildSetting;+import io.onedev.server.web.editable.annotation.BuildQuery;+import io.onedev.server.web.editable.annotation.Editable;++@Editable+public class ProjectBuildSetting implements Serializable {++ private static final long serialVersionUID = 1L;++ private List<NamedBuildQuery> namedQueries;++ private transient BuildSetting setting;++ private String buildsToPreserve = "all";++ @Editable(description="Specify builds to preserve. OneDev will run every night to remove builds not matching "+ + "query specified here")+ @BuildQuery(noLoginSupport=true)+ @NotEmpty+ public String getBuildsToPreserve() {+ return buildsToPreserve;+ }++ public void setBuildsToPreserve(String buildsToPreserve) {+ this.buildsToPreserve = buildsToPreserve;+ }++ private BuildSetting getSetting() {+ if (setting == null)+ setting = OneDev.getInstance(SettingManager.class).getBuildSetting();+ return setting;+ }++ @Nullable+ public List<NamedBuildQuery> getNamedQueries(boolean useDefaultIfNotDefined) {+ if (useDefaultIfNotDefined && namedQueries == null)+ return new ArrayList<>(getSetting().getNamedQueries());+ else+ return namedQueries;+ }++ public void setNamedQueries(@Nullable List<NamedBuildQuery> namedQueries) {+ this.namedQueries = namedQueries;+ }++ @Nullable+ public NamedBuildQuery getNamedQuery(String name) {+ for (NamedBuildQuery namedQuery: getNamedQueries(true)) {+ if (namedQuery.getName().equals(name))+ return namedQuery;+ }+ return null;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/BuildSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/BuildSetting.javanew file mode 100644index 0000000000..6eb2fa84a2--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/BuildSetting.java@@ -0,0 +1,48 @@+package io.onedev.server.model.support.administration;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;++import javax.annotation.Nullable;++import io.onedev.server.model.support.NamedBuildQuery;++public class BuildSetting implements Serializable {++ private static final long serialVersionUID = 1L;++ private List<NamedBuildQuery> namedQueries = new ArrayList<>();++ public BuildSetting() {+ namedQueries.add(new NamedBuildQuery("All", "all"));+ namedQueries.add(new NamedBuildQuery("Successful", "successful"));+ namedQueries.add(new NamedBuildQuery("Failed", "failed"));+ namedQueries.add(new NamedBuildQuery("Failed eventually", "failed and not(will retry)"));+ namedQueries.add(new NamedBuildQuery("In error", "in error"));+ namedQueries.add(new NamedBuildQuery("Cancelled", "cancelled"));+ namedQueries.add(new NamedBuildQuery("Timed out", "timed out"));+ namedQueries.add(new NamedBuildQuery("Running", "running"));+ namedQueries.add(new NamedBuildQuery("Waiting", "waiting"));+ namedQueries.add(new NamedBuildQuery("Queueing", "queueing"));+ namedQueries.add(new NamedBuildQuery("Build recently", "\"Submit Date\" is after \"last week\""));+ }++ public List<NamedBuildQuery> getNamedQueries() {+ return namedQueries;+ }++ public void setNamedQueries(List<NamedBuildQuery> namedQueries) {+ this.namedQueries = namedQueries;+ }++ @Nullable+ public NamedBuildQuery getNamedQuery(String name) {+ for (NamedBuildQuery namedQuery: getNamedQueries()) {+ if (namedQuery.getName().equals(name))+ return namedQuery;+ }+ return null;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/IssueSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/IssueSetting.javaindex 5eb806b3c4..bfeda04864 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/IssueSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/IssueSetting.java@@ -527,4 +527,13 @@ public class IssueSetting implements Serializable {this.namedQueries = namedQueries;}+ @Nullable+ public NamedIssueQuery getNamedQuery(String name) {+ for (NamedIssueQuery namedQuery: getNamedQueries()) {+ if (namedQuery.getName().equals(name))+ return namedQuery;+ }+ return null;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/PullRequestSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/PullRequestSetting.javanew file mode 100644index 0000000000..7f8ed97ae6--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/PullRequestSetting.java@@ -0,0 +1,47 @@+package io.onedev.server.model.support.administration;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;++import javax.annotation.Nullable;++import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;++public class PullRequestSetting implements Serializable {++ private static final long serialVersionUID = 1L;++ private List<NamedPullRequestQuery> namedQueries = new ArrayList<>();++ public PullRequestSetting() {+ namedQueries.add(new NamedPullRequestQuery("Open", "open"));+ namedQueries.add(new NamedPullRequestQuery("To be reviewed by me", "to be reviewed by me"));+ namedQueries.add(new NamedPullRequestQuery("To be changed by me", "submitted by me and someone requested for changes"));+ namedQueries.add(new NamedPullRequestQuery("Requested for changes by me", "requested for changes by me"));+ namedQueries.add(new NamedPullRequestQuery("Approved by me", "approved by me"));+ namedQueries.add(new NamedPullRequestQuery("Submitted by me", "submitted by me"));+ namedQueries.add(new NamedPullRequestQuery("Submitted recently", "\"Submit Date\" is after \"last week\""));+ namedQueries.add(new NamedPullRequestQuery("Updated recently", "\"Update Date\" is after \"last week\""));+ namedQueries.add(new NamedPullRequestQuery("Closed", "merged or discarded"));+ namedQueries.add(new NamedPullRequestQuery("All", "all"));+ }++ public List<NamedPullRequestQuery> getNamedQueries() {+ return namedQueries;+ }++ public void setNamedQueries(List<NamedPullRequestQuery> namedQueries) {+ this.namedQueries = namedQueries;+ }++ @Nullable+ public NamedPullRequestQuery getNamedQuery(String name) {+ for (NamedPullRequestQuery namedQuery: getNamedQueries()) {+ if (namedQuery.getName().equals(name))+ return namedQuery;+ }+ return null;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/ProjectPullRequestSetting.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/ProjectPullRequestSetting.javanew file mode 100644index 0000000000..9912f60711--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/ProjectPullRequestSetting.java@@ -0,0 +1,48 @@+package io.onedev.server.model.support.pullrequest;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;++import javax.annotation.Nullable;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.model.support.administration.PullRequestSetting;++public class ProjectPullRequestSetting implements Serializable {++ private static final long serialVersionUID = 1L;++ private List<NamedPullRequestQuery> namedQueries;++ private transient PullRequestSetting setting;++ private PullRequestSetting getSetting() {+ if (setting == null)+ setting = OneDev.getInstance(SettingManager.class).getPullRequestSetting();+ return setting;+ }++ @Nullable+ public List<NamedPullRequestQuery> getNamedQueries(boolean useDefaultIfNotDefined) {+ if (useDefaultIfNotDefined && namedQueries == null)+ return new ArrayList<>(getSetting().getNamedQueries());+ else+ return namedQueries;+ }++ public void setNamedQueries(@Nullable List<NamedPullRequestQuery> namedQueries) {+ this.namedQueries = namedQueries;+ }++ @Nullable+ public NamedPullRequestQuery getNamedQuery(String name) {+ for (NamedPullRequestQuery namedQuery: getNamedQueries(true)) {+ if (namedQuery.getName().equals(name))+ return namedQuery;+ }+ return null;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.javaindex bf823ea55f..bfcfdad196 100644--- a/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java@@ -10,7 +10,9 @@ import javax.inject.Inject;import javax.inject.Singleton;import io.onedev.commons.launcher.loader.Listen;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.entitymanager.UrlManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.event.build.BuildEvent;import io.onedev.server.model.Build;import io.onedev.server.model.BuildQuerySetting;@@ -27,13 +29,21 @@ public class BuildNotificationManager {private final UrlManager urlManager;+ private final UserManager userManager;++ private final SettingManager settingManager;+@Inject- public BuildNotificationManager(MailManager mailManager, UrlManager urlManager) {+ public BuildNotificationManager(MailManager mailManager, UrlManager urlManager,+ UserManager userManager, SettingManager settingManager) {this.mailManager = mailManager;this.urlManager = urlManager;+ this.userManager = userManager;+ this.settingManager = settingManager;}- private void fillSubscribedQueryStrings(Map<User, Collection<String>> subscribedQueryStrings, User user, @Nullable NamedQuery query) {+ private void fillSubscribedQueryStrings(Map<User, Collection<String>> subscribedQueryStrings,+ User user, @Nullable NamedQuery query) {if (query != null) {Collection<String> value = subscribedQueryStrings.get(user);if (value == null) {@@ -64,10 +74,14 @@ public class BuildNotificationManager {Project project = event.getProject();Map<User, Collection<String>> subscribedQueryStrings = new HashMap<>();for (BuildQuerySetting setting: project.getUserBuildQuerySettings()) {- for (String name: setting.getQuerySubscriptionSupport().getQuerySubscriptions())- fillSubscribedQueryStrings(subscribedQueryStrings, setting.getUser(), NamedQuery.find(project.getNamedBuildQueries(), name));- for (String name: setting.getQuerySubscriptionSupport().getUserQuerySubscriptions())- fillSubscribedQueryStrings(subscribedQueryStrings, setting.getUser(), NamedQuery.find(setting.getUserQueries(), name));+ for (String name: setting.getQuerySubscriptionSupport().getQuerySubscriptions()) {+ fillSubscribedQueryStrings(subscribedQueryStrings, setting.getUser(),+ NamedQuery.find(project.getBuildSetting().getNamedQueries(true), name));+ }+ for (String name: setting.getQuerySubscriptionSupport().getUserQuerySubscriptions()) {+ fillSubscribedQueryStrings(subscribedQueryStrings, setting.getUser(),+ NamedQuery.find(setting.getUserQueries(), name));+ }}Build build = event.getBuild();@@ -84,6 +98,32 @@ public class BuildNotificationManager {}}}++ subscribedQueryStrings.clear();+ for (User user: userManager.query()) {+ for (String name: user.getBuildQuerySetting().getQuerySubscriptionSupport().getQuerySubscriptions()) {+ fillSubscribedQueryStrings(subscribedQueryStrings, user,+ NamedQuery.find(settingManager.getBuildSetting().getNamedQueries(), name));+ }+ for (String name: user.getBuildQuerySetting().getQuerySubscriptionSupport().getUserQuerySubscriptions()) {+ fillSubscribedQueryStrings(subscribedQueryStrings, user,+ NamedQuery.find(user.getBuildQuerySetting().getUserQueries(), name));+ }+ }++ for (Map.Entry<User, Collection<String>> entry: subscribedQueryStrings.entrySet()) {+ User user = entry.getKey();+ for (String queryString: entry.getValue()) {+ try {+ if (BuildQuery.parse(null, queryString).matches(build, user)) {+ notifyEmails.add(user.getEmail());+ break;+ }+ } catch (Exception e) {+ }+ }+ }+notify(build, notifyEmails);}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.javaindex 8d0d501fd3..5b7a3f9476 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@@ -18,7 +18,9 @@ import com.google.common.collect.Lists;import io.onedev.commons.launcher.loader.Listen;import io.onedev.server.cache.UserInfoManager;import io.onedev.server.entitymanager.PullRequestWatchManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.entitymanager.UrlManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.event.MarkdownAware;import io.onedev.server.event.pullrequest.PullRequestBuildEvent;import io.onedev.server.event.pullrequest.PullRequestChangeEvent;@@ -63,15 +65,21 @@ public class PullRequestNotificationManager implements PersistListener {private final UserInfoManager userInfoManager;+ private final UserManager userManager;++ private final SettingManager settingManager;+@Injectpublic PullRequestNotificationManager(MailManager mailManager, UrlManager urlManager,MarkdownManager markdownManager, PullRequestWatchManager pullRequestWatchManager,- UserInfoManager userInfoManager) {+ UserInfoManager userInfoManager, UserManager userManager, SettingManager settingManager) {this.mailManager = mailManager;this.urlManager = urlManager;this.markdownManager = markdownManager;this.pullRequestWatchManager = pullRequestWatchManager;this.userInfoManager = userInfoManager;+ this.userManager = userManager;+ this.settingManager = settingManager;}@Transactional@@ -80,7 +88,7 @@ public class PullRequestNotificationManager implements PersistListener {PullRequest request = event.getRequest();User user = event.getUser();- for(Map.Entry<User, Boolean> entry: new QueryWatchBuilder<PullRequest>() {+ for (Map.Entry<User, Boolean> entry: new QueryWatchBuilder<PullRequest>() {@Overrideprotected PullRequest getEntity() {@@ -99,12 +107,38 @@ public class PullRequestNotificationManager implements PersistListener {@Overrideprotected Collection<? extends NamedQuery> getNamedQueries() {- return request.getTargetProject().getNamedPullRequestQueries();+ return request.getTargetProject().getPullRequestSetting().getNamedQueries(true);}}.getWatches().entrySet()) {watch(request, entry.getKey(), entry.getValue());- };+ }++ for (Map.Entry<User, Boolean> entry: new QueryWatchBuilder<PullRequest>() {++ @Override+ protected PullRequest getEntity() {+ return request;+ }++ @Override+ protected Collection<? extends QuerySetting<?>> getQuerySettings() {+ return userManager.query().stream().map(it->it.getPullRequestQuerySetting()).collect(Collectors.toList());+ }++ @Override+ protected EntityQuery<PullRequest> parse(String queryString) {+ return PullRequestQuery.parse(null, queryString);+ }++ @Override+ protected Collection<? extends NamedQuery> getNamedQueries() {+ return settingManager.getPullRequestSetting().getNamedQueries();+ }++ }.getWatches().entrySet()) {+ watch(request, entry.getKey(), entry.getValue());+ }if (user != null)watch(request, user, true);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueCriteria.javaindex 16373cba07..d9d4d98808 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueCriteria.java@@ -21,7 +21,8 @@ public abstract class IssueCriteria extends EntityCriteria<Issue> {private static final long serialVersionUID = 1L;- public abstract Predicate getPredicate(Project project, Root<Issue> root, CriteriaBuilder builder, User user);+ public abstract Predicate getPredicate(@Nullable Project project, Root<Issue> root,+ CriteriaBuilder builder, @Nullable User user);public final void fill(Issue issue) {fill(issue, new HashSet<>());diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.javaindex b309937d70..dbc997a963 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java@@ -1,15 +1,6 @@package io.onedev.server.search.entity.issue;-import static io.onedev.server.util.IssueConstants.FIELD_COMMENT;-import static io.onedev.server.util.IssueConstants.FIELD_COMMENT_COUNT;-import static io.onedev.server.util.IssueConstants.FIELD_DESCRIPTION;-import static io.onedev.server.util.IssueConstants.FIELD_MILESTONE;-import static io.onedev.server.util.IssueConstants.FIELD_NUMBER;-import static io.onedev.server.util.IssueConstants.FIELD_STATE;-import static io.onedev.server.util.IssueConstants.FIELD_SUBMIT_DATE;-import static io.onedev.server.util.IssueConstants.FIELD_TITLE;-import static io.onedev.server.util.IssueConstants.FIELD_UPDATE_DATE;-import static io.onedev.server.util.IssueConstants.FIELD_VOTE_COUNT;+import static io.onedev.server.util.IssueConstants.*;import java.io.IOException;import java.util.ArrayList;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.javaindex 592977e393..5265dcf66f 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java@@ -53,7 +53,7 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {this(null, new ArrayList<>());}- public static PullRequestQuery parse(Project project, @Nullable String queryString) {+ public static PullRequestQuery parse(@Nullable Project project, @Nullable String queryString) {if (queryString != null) {CharStream is = CharStreams.fromString(queryString);PullRequestQueryLexer lexer = new PullRequestQueryLexer(is);@@ -99,7 +99,7 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {case PullRequestQueryLexer.ToBeReviewedByMe:return new ToBeReviewedByMeCriteria();case PullRequestQueryLexer.RequestedForChangesByMe:- return new RequestForChangesByMeCriteria();+ return new RequestedForChangesByMeCriteria();case PullRequestQueryLexer.ApprovedByMe:return new ApprovedByMeCriteria();case PullRequestQueryLexer.DiscardedByMe:@@ -128,15 +128,21 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {case PullRequestQueryLexer.ApprovedBy:return new ApprovedByCriteria(getUser(value));case PullRequestQueryLexer.RequestedForChangesBy:- return new RequestForChangesByCriteria(getUser(value));+ return new RequestedForChangesByCriteria(getUser(value));case PullRequestQueryLexer.SubmittedBy:return new SubmittedByCriteria(getUser(value));case PullRequestQueryLexer.DiscardedBy:return new DiscardedByCriteria(getUser(value));case PullRequestQueryLexer.IncludesCommit:- return new IncludesCommitCriteria(getCommitId(project, value));+ if (project != null)+ return new IncludesCommitCriteria(getCommitId(project, value));+ else+ throw new OneException("Unsupported operator in global issue query: " + getRuleName(PullRequestQueryLexer.IncludesCommit));case PullRequestQueryLexer.IncludesIssue:- return new IncludesIssueCriteria(getIssue(project, value));+ if (project != null)+ return new IncludesIssueCriteria(getIssue(project, value));+ else+ throw new OneException("Unsupported operator in global issue query: " + getRuleName(PullRequestQueryLexer.IncludesIssue));default:throw new OneException("Unexpected operator: " + ctx.operator.getText());}@@ -152,7 +158,7 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {String fieldName = getValue(ctx.Quoted(0).getText());String value = getValue(ctx.Quoted(1).getText());int operator = ctx.operator.getType();- checkField(project, fieldName, operator);+ checkField(fieldName, operator);switch (operator) {case PullRequestQueryLexer.IsBefore:@@ -261,7 +267,7 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {}}- public static void checkField(Project project, String fieldName, int operator) {+ public static void checkField(String fieldName, int operator) {if (!PullRequestConstants.QUERY_FIELDS.contains(fieldName))throw new OneException("Field not found: " + fieldName);switch (operator) {diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestForChangesByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByCriteria.javasimilarity index 93%rename from server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestForChangesByCriteria.javarename to server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByCriteria.javaindex e7c31ef5cc..def07638b0 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestForChangesByCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByCriteria.java@@ -14,13 +14,13 @@ import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.PullRequestConstants;-public class RequestForChangesByCriteria extends PullRequestCriteria {+public class RequestedForChangesByCriteria extends PullRequestCriteria {private static final long serialVersionUID = 1L;private final User value;- public RequestForChangesByCriteria(User value) {+ public RequestedForChangesByCriteria(User value) {this.value = value;}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestForChangesByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.javasimilarity index 95%rename from server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestForChangesByMeCriteria.javarename to server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.javaindex b2978984fc..be66fe38e9 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestForChangesByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.java@@ -14,7 +14,7 @@ import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.util.PullRequestConstants;-public class RequestForChangesByMeCriteria extends PullRequestCriteria {+public class RequestedForChangesByMeCriteria extends PullRequestCriteria {private static final long serialVersionUID = 1L;diff --git a/server-core/src/main/java/io/onedev/server/util/IssueConstants.java b/server-core/src/main/java/io/onedev/server/util/IssueConstants.javaindex 862c768621..2908100fa2 100644--- a/server-core/src/main/java/io/onedev/server/util/IssueConstants.java+++ b/server-core/src/main/java/io/onedev/server/util/IssueConstants.java@@ -59,7 +59,7 @@ public class IssueConstants {public static final String ATTR_MILESTONE = "milestone";public static final String ATTR_FIELDS = "fields";-+public static final Set<String> ALL_FIELDS = Sets.newHashSet(FIELD_NUMBER, FIELD_STATE, FIELD_TITLE, FIELD_SUBMITTER, FIELD_DESCRIPTION,FIELD_COMMENT, FIELD_SUBMIT_DATE, FIELD_UPDATE_DATE, FIELD_VOTE_COUNT,diff --git a/server-core/src/main/java/io/onedev/server/util/PullRequestConstants.java b/server-core/src/main/java/io/onedev/server/util/PullRequestConstants.javaindex 13f96320cf..7cd3f0758d 100644--- a/server-core/src/main/java/io/onedev/server/util/PullRequestConstants.java+++ b/server-core/src/main/java/io/onedev/server/util/PullRequestConstants.java@@ -14,6 +14,8 @@ public class PullRequestConstants {public static final String FIELD_STATUS = "Status";+ public static final String ATTR_TARGET_PROJECT = "targetProject";+public static final String FIELD_TARGET_BRANCH = "Target Branch";public static final String ATTR_TARGET_BRANCH = "targetBranch";diff --git a/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java b/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.javaindex f80e9bd044..0b3dad40cc 100644--- a/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java+++ b/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java@@ -98,6 +98,7 @@ import io.onedev.server.web.page.project.setting.webhook.WebHooksPage;import io.onedev.server.web.page.project.stats.ProjectContribsPage;import io.onedev.server.web.page.project.stats.SourceLinesPage;import io.onedev.server.web.page.project.tags.ProjectTagsPage;+import io.onedev.server.web.page.pullrequest.PullRequestListPage;import io.onedev.server.web.page.security.ForgetPage;import io.onedev.server.web.page.security.LoginPage;import io.onedev.server.web.page.security.LogoutPage;@@ -109,6 +110,7 @@ public class OneUrlMapper extends CompoundRequestMapper {add(new OnePageMapper("init", ServerInitPage.class));add(new OnePageMapper("loading", BrowserInfoPage.class));add(new OnePageMapper("issues", IssueListPage.class));+ add(new OnePageMapper("pull-requests", PullRequestListPage.class));addProjectPages();addMyPages();addAdministrationPages();diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.javaindex ca93148434..4e0aeed5b8 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java@@ -9,6 +9,7 @@ import static io.onedev.server.search.entity.issue.IssueQueryLexer.FixedInBuild;import static io.onedev.server.search.entity.issue.IssueQueryLexer.IsMe;import static io.onedev.server.search.entity.issue.IssueQueryLexer.Mine;import static io.onedev.server.search.entity.issue.IssueQueryLexer.SubmittedBy;+import static io.onedev.server.search.entity.issue.IssueQueryLexer.SubmittedByMe;import static io.onedev.server.util.IssueConstants.FIELD_COMMENT;import static io.onedev.server.util.IssueConstants.FIELD_COMMENT_COUNT;import static io.onedev.server.util.IssueConstants.FIELD_DESCRIPTION;@@ -209,11 +210,17 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {return null;}- if (suggestedLiteral.equals(getRuleName(IsMe)) && SecurityUtils.getUser() == null)+ if (SecurityUtils.getUser() == null+ && (suggestedLiteral.equals(getRuleName(IsMe))+ || suggestedLiteral.equals(getRuleName(SubmittedByMe)))) {return null;+ }- if (getProject() == null && (suggestedLiteral.equals(getRuleName(FixedBetween)) || suggestedLiteral.equals(getRuleName(FixedInBuild))))+ if (getProject() == null+ && (suggestedLiteral.equals(getRuleName(FixedBetween))+ || suggestedLiteral.equals(getRuleName(FixedInBuild)))) {return null;+ }parseExpect = parseExpect.findExpectByLabel("operator");if (parseExpect != null) {diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.javaindex bf52da6a50..9185bf792f 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java@@ -1,5 +1,14 @@package io.onedev.server.web.behavior;+import static io.onedev.server.search.entity.pullrequest.PullRequestQuery.getRuleName;+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer.IncludesCommit;+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer.IncludesIssue;+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer.ToBeReviewedByMe;+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer.RequestedForChangesByMe;+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer.ApprovedByMe;+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer.SubmittedByMe;+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer.DiscardedByMe;+import java.util.ArrayList;import java.util.List;@@ -24,6 +33,7 @@ import io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer;import io.onedev.server.search.entity.pullrequest.PullRequestQueryParser;import io.onedev.server.util.DateUtils;import io.onedev.server.util.PullRequestConstants;+import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;import io.onedev.server.web.util.SuggestionUtils;@@ -77,7 +87,7 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {} else {String fieldName = PullRequestQuery.getValue(fieldElements.get(0).getMatchedText());try {- PullRequestQuery.checkField(project, fieldName, operator);+ PullRequestQuery.checkField(fieldName, operator);if (fieldName.equals(PullRequestConstants.FIELD_SUBMIT_DATE)|| fieldName.equals(PullRequestConstants.FIELD_UPDATE_DATE)|| fieldName.equals(PullRequestConstants.FIELD_CLOSE_DATE)) {@@ -120,13 +130,27 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {@Overrideprotected Optional<String> describe(ParseExpect parseExpect, String suggestedLiteral) {+ if (SecurityUtils.getUser() == null+ && (suggestedLiteral.equals(getRuleName(ToBeReviewedByMe))+ || suggestedLiteral.equals(getRuleName(RequestedForChangesByMe))+ || suggestedLiteral.equals(getRuleName(ApprovedByMe))+ || suggestedLiteral.equals(getRuleName(SubmittedByMe))+ || suggestedLiteral.equals(getRuleName(DiscardedByMe)))) {+ return null;+ }+ if (getProject() == null+ && (suggestedLiteral.equals(getRuleName(IncludesCommit))+ || suggestedLiteral.equals(getRuleName(IncludesIssue)))) {+ return null;+ }+parseExpect = parseExpect.findExpectByLabel("operator");if (parseExpect != null) {List<Element> fieldElements = parseExpect.getState().findMatchedElementsByLabel("criteriaField", false);if (!fieldElements.isEmpty()) {String fieldName = PullRequestQuery.getValue(fieldElements.iterator().next().getMatchedText());try {- PullRequestQuery.checkField(getProject(), fieldName, PullRequestQuery.getOperator(suggestedLiteral));+ PullRequestQuery.checkField(fieldName, PullRequestQuery.getOperator(suggestedLiteral));} catch (OneException e) {return null;}diff --git a/server-core/src/main/java/io/onedev/server/web/component/branch/BranchLink.java b/server-core/src/main/java/io/onedev/server/web/component/branch/BranchLink.javaindex 75e8a4fbaf..fcc3b0933d 100644--- a/server-core/src/main/java/io/onedev/server/web/component/branch/BranchLink.java+++ b/server-core/src/main/java/io/onedev/server/web/component/branch/BranchLink.java@@ -11,6 +11,7 @@ import org.eclipse.jgit.lib.FileMode;import io.onedev.server.git.BlobIdent;import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.ProjectAndBranch;+import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.blob.ProjectBlobPage;@@ -35,7 +36,8 @@ public class BranchLink extends ViewStateAwarePageLink<Void> {@Overrideprotected void onConfigure() {super.onConfigure();- setEnabled(projectAndBranch.getObjectName(false) != null);+ setEnabled(SecurityUtils.canReadCode(projectAndBranch.getProject())+ && projectAndBranch.getObjectName(false) != null);}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.htmlindex f11f2af889..3285ca3299 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html@@ -9,9 +9,9 @@</span></div></form>- <div wicket:id="others" class="others clearfix">- <a wicket:id="showSavedQueries" class="show-saved-queries pull-left"><i class="fa fa-eye"></i> Show Saved Queries</a>- <a wicket:id="saveQuery" class="pull-left save-query"><i class="fa fa-save"></i> Save Query</a>+ <div wicket:id="others" class="others">+ <a wicket:id="showSavedQueries" class="show-saved-queries"><i class="fa fa-eye"></i> Show Saved Queries</a>+ <a wicket:id="saveQuery" class="save-query"><i class="fa fa-save"></i> Save Query</a></div></div><div wicket:id="body" class="body">diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.javaindex d30abe9500..53732942a0 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java@@ -7,7 +7,6 @@ import java.util.List;import javax.annotation.Nullable;-import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;import org.apache.wicket.ajax.markup.html.AjaxLink;@@ -73,7 +72,6 @@ import io.onedev.server.web.page.project.commits.CommitDetailPage;import io.onedev.server.web.util.PagingHistorySupport;import io.onedev.server.web.util.QueryPosition;import io.onedev.server.web.util.QuerySaveSupport;-import io.onedev.server.web.util.VisibleVisitor;@SuppressWarnings("serial")public abstract class BuildListPanel extends Panel {@@ -157,15 +155,8 @@ public abstract class BuildListPanel extends Panel {protected void onInitialize() {super.onInitialize();- WebMarkupContainer others = new WebMarkupContainer("others") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(visitChildren(Component.class, new VisibleVisitor()) != null);- }-- };+ WebMarkupContainer others = new WebMarkupContainer("others");+ others.setOutputMarkupId(true);add(others);others.add(new AjaxLink<Void>("showSavedQueries") {@@ -174,7 +165,7 @@ public abstract class BuildListPanel extends Panel {public void onEvent(IEvent<?> event) {super.onEvent(event);if (event.getPayload() instanceof SavedQueriesClosed) {- ((SavedQueriesClosed) event.getPayload()).getHandler().add(this);+ ((SavedQueriesClosed) event.getPayload()).getHandler().add(others);}}@@ -187,13 +178,12 @@ public abstract class BuildListPanel extends Panel {@Overridepublic void onClick(AjaxRequestTarget target) {send(getPage(), Broadcast.BREADTH, new SavedQueriesOpened(target));- target.add(this);+ target.add(others);}- }.setOutputMarkupPlaceholderTag(true));+ });- Component querySave;- others.add(querySave = new AjaxLink<Void>("saveQuery") {+ others.add(new AjaxLink<Void>("saveQuery") {@Overrideprotected void onConfigure() {@@ -234,7 +224,7 @@ public abstract class BuildListPanel extends Panel {@Overrideprotected void onUpdate(AjaxRequestTarget target) {if (SecurityUtils.getUser() != null && getQuerySaveSupport() != null)- target.add(querySave);+ target.add(others);}});diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/build-list.css b/server-core/src/main/java/io/onedev/server/web/component/build/list/build-list.cssindex f8cd88cc67..5f2aa5b7b0 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/build-list.css+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/build-list.css@@ -9,6 +9,9 @@.build-list>.head>* {margin-bottom: 20px;}+.build-list>.head>.others:empty {+ margin-bottom: 0;+}.build-list>.head>.others>* {margin-right: 16px;color: #666;diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.htmlindex f39b026451..9886713250 100644--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.html@@ -9,9 +9,9 @@</span></div></form>- <div wicket:id="others" class="others clearfix">- <a wicket:id="showSavedQueries" class="show-saved-queries pull-left"><i class="fa fa-eye"></i> Show Saved Queries</a>- <a wicket:id="saveQuery" class="pull-left save-query"><i class="fa fa-save"></i> Save Query</a>+ <div wicket:id="others" class="others">+ <a wicket:id="showSavedQueries" class="show-saved-queries"><i class="fa fa-eye"></i> Show Saved Queries</a>+ <a wicket:id="saveQuery" class="save-query"><i class="fa fa-save"></i> Save Query</a></div></div><div wicket:id="body" class="body">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.javaindex c4ab9b2261..8e88e41bc8 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@@ -6,7 +6,6 @@ import java.util.List;import javax.annotation.Nullable;-import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;import org.apache.wicket.ajax.markup.html.AjaxLink;@@ -60,7 +59,6 @@ import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPaimport io.onedev.server.web.page.project.pullrequests.detail.changes.PullRequestChangesPage;import io.onedev.server.web.util.PagingHistorySupport;import io.onedev.server.web.util.QuerySaveSupport;-import io.onedev.server.web.util.VisibleVisitor;@SuppressWarnings("serial")public abstract class CodeCommentListPanel extends Panel {@@ -103,16 +101,8 @@ public abstract class CodeCommentListPanel extends Panel {protected void onInitialize() {super.onInitialize();- WebMarkupContainer others = new WebMarkupContainer("others") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(visitChildren(Component.class, new VisibleVisitor()) != null);- }-- };-+ WebMarkupContainer others = new WebMarkupContainer("others");+ others.setOutputMarkupId(true);add(others);others.add(new AjaxLink<Void>("showSavedQueries") {@@ -121,7 +111,7 @@ public abstract class CodeCommentListPanel extends Panel {public void onEvent(IEvent<?> event) {super.onEvent(event);if (event.getPayload() instanceof SavedQueriesClosed) {- ((SavedQueriesClosed) event.getPayload()).getHandler().add(this);+ ((SavedQueriesClosed) event.getPayload()).getHandler().add(others);}}@@ -134,13 +124,12 @@ public abstract class CodeCommentListPanel extends Panel {@Overridepublic void onClick(AjaxRequestTarget target) {send(getPage(), Broadcast.BREADTH, new SavedQueriesOpened(target));- target.add(this);+ target.add(others);}- }.setOutputMarkupPlaceholderTag(true));+ });- Component querySave;- others.add(querySave = new AjaxLink<Void>("saveQuery") {+ others.add(new AjaxLink<Void>("saveQuery") {@Overrideprotected void onConfigure() {@@ -180,7 +169,7 @@ public abstract class CodeCommentListPanel extends Panel {@Overrideprotected void onUpdate(AjaxRequestTarget target) {if (SecurityUtils.getUser() != null && getQuerySaveSupport() != null)- target.add(querySave);+ target.add(others);}});diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/code-comment.css b/server-core/src/main/java/io/onedev/server/web/component/codecomment/code-comment.cssindex a111464caf..6108b62d62 100644--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/code-comment.css+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/code-comment.css@@ -1,6 +1,9 @@.code-comments>.head>* {margin-bottom: 20px;}+.code-comments>.head>.others:empty {+ margin-bottom: 0;+}.code-comments>.head>.others>* {margin-right: 16px;color: #666;diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.htmlindex 18b79ab73f..a1a9a6a29d 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.html@@ -9,9 +9,9 @@</span></div></form>- <div wicket:id="others" class="others clearfix">- <a wicket:id="showSavedQueries" class="show-saved-queries pull-left"><i class="fa fa-eye"></i> Show Saved Queries</a>- <a wicket:id="saveQuery" class="pull-left save-query"><i class="fa fa-save"></i> Save Query</a>+ <div wicket:id="others" class="others">+ <a wicket:id="showSavedQueries" class="show-saved-queries"><i class="fa fa-eye"></i> Show Saved Queries</a>+ <a wicket:id="saveQuery" class="save-query"><i class="fa fa-save"></i> Save Query</a></div></div><div wicket:id="body" class="body">diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.javaindex a72ade9a86..18c7dae47e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java@@ -83,7 +83,6 @@ import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.commits.CommitDetailPage;import io.onedev.server.web.page.project.compare.RevisionComparePage;import io.onedev.server.web.util.QuerySaveSupport;-import io.onedev.server.web.util.VisibleVisitor;@SuppressWarnings("serial")public class CommitListPanel extends Panel {@@ -273,15 +272,8 @@ public class CommitListPanel extends Panel {protected void onInitialize() {super.onInitialize();- WebMarkupContainer others = new WebMarkupContainer("others") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(visitChildren(Component.class, new VisibleVisitor()) != null);- }-- };+ WebMarkupContainer others = new WebMarkupContainer("others");+ others.setOutputMarkupId(true);add(others);others.add(new AjaxLink<Void>("showSavedQueries") {@@ -290,7 +282,7 @@ public class CommitListPanel extends Panel {public void onEvent(IEvent<?> event) {super.onEvent(event);if (event.getPayload() instanceof SavedQueriesClosed) {- ((SavedQueriesClosed) event.getPayload()).getHandler().add(this);+ ((SavedQueriesClosed) event.getPayload()).getHandler().add(others);}}@@ -303,13 +295,12 @@ public class CommitListPanel extends Panel {@Overridepublic void onClick(AjaxRequestTarget target) {send(getPage(), Broadcast.BREADTH, new SavedQueriesOpened(target));- target.add(this);+ target.add(others);}- }.setOutputMarkupPlaceholderTag(true));+ });- Component querySave;- others.add(querySave = new AjaxLink<Void>("saveQuery") {+ others.add(new AjaxLink<Void>("saveQuery") {@Overrideprotected void onConfigure() {@@ -349,7 +340,7 @@ public class CommitListPanel extends Panel {@Overrideprotected void onUpdate(AjaxRequestTarget target) {if (SecurityUtils.getUser() != null && getQuerySaveSupport() != null)- target.add(querySave);+ target.add(others);}});diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/list/commit-list.css b/server-core/src/main/java/io/onedev/server/web/component/commit/list/commit-list.cssindex 180a488fad..7d5f1a0b41 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commit/list/commit-list.css+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/list/commit-list.css@@ -12,6 +12,9 @@.commit-list>.head>* {margin-bottom: 20px;}+.commit-list>.head>.others:empty {+ margin-bottom: 0;+}.commit-list>.head>.others>* {margin-right: 16px;color: #666;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.htmlindex 0838743fa4..21ea5063ee 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@@ -10,12 +10,12 @@</div></form><a wicket:id="newIssue" class="open-new btn btn-success"><i class="fa fa-plus"></i> New Issue</a>- <div wicket:id="others" class="others clearfix">- <a wicket:id="showSavedQueries" class="show-saved-queries pull-left"><i class="fa fa-eye"></i> Show Saved Queries</a>- <a wicket:id="saveQuery" class="pull-left save-query"><i class="fa fa-save"></i> Save Query</a>- <a wicket:id="batchEditSelected" class="pull-left"><i class="fa fa-pencil"></i> Batch Edit Selected</a>- <a wicket:id="batchEditAll" class="pull-left"><i class="fa fa-pencil"></i> Batch Edit All</a>- <a wicket:id="listFields" class="list-fields pull-left"><i class="fa fa-list-ul"></i> Display Fields</a>+ <div wicket:id="others" class="others">+ <a wicket:id="showSavedQueries" class="show-saved-queries"><i class="fa fa-eye"></i> Show Saved Queries</a>+ <a wicket:id="saveQuery" class="save-query"><i class="fa fa-save"></i> Save Query</a>+ <a wicket:id="batchEditSelected"><i class="fa fa-pencil"></i> Batch Edit Selected</a>+ <a wicket:id="batchEditAll"><i class="fa fa-pencil"></i> Batch Edit All</a>+ <a wicket:id="listFields" class="list-fields"><i class="fa fa-list-ul"></i> Display Fields</a></div></div><div wicket:id="body" class="body">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.javaindex ca97278292..f641d3b1c3 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@@ -80,7 +80,6 @@ import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;import io.onedev.server.web.util.PagingHistorySupport;import io.onedev.server.web.util.QueryPosition;import io.onedev.server.web.util.QuerySaveSupport;-import io.onedev.server.web.util.VisibleVisitor;@SuppressWarnings("serial")public abstract class IssueListPanel extends Panel {@@ -118,8 +117,6 @@ public abstract class IssueListPanel extends Panel {private SelectionColumn<Issue, Void> selectionColumn;- private ModalLink batchEditSelected;-private SortableDataProvider<Issue, Void> dataProvider;public IssueListPanel(String id, @Nullable Project project, @Nullable String query) {@@ -169,15 +166,8 @@ public abstract class IssueListPanel extends Panel {protected void onInitialize() {super.onInitialize();- WebMarkupContainer others = new WebMarkupContainer("others") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(visitChildren(Component.class, new VisibleVisitor()) != null);- }-- };+ WebMarkupContainer others = new WebMarkupContainer("others");+ others.setOutputMarkupId(true);add(others);others.add(new AjaxLink<Void>("showSavedQueries") {@@ -186,7 +176,7 @@ public abstract class IssueListPanel extends Panel {public void onEvent(IEvent<?> event) {super.onEvent(event);if (event.getPayload() instanceof SavedQueriesClosed) {- ((SavedQueriesClosed) event.getPayload()).getHandler().add(this);+ ((SavedQueriesClosed) event.getPayload()).getHandler().add(others);}}@@ -199,13 +189,12 @@ public abstract class IssueListPanel extends Panel {@Overridepublic void onClick(AjaxRequestTarget target) {send(getPage(), Broadcast.BREADTH, new SavedQueriesOpened(target));- target.add(this);+ target.add(others);}- }.setOutputMarkupPlaceholderTag(true));+ });- Component querySave;- others.add(querySave = new AjaxLink<Void>("saveQuery") {+ others.add(new AjaxLink<Void>("saveQuery") {@Overrideprotected void onConfigure() {@@ -245,7 +234,7 @@ public abstract class IssueListPanel extends Panel {@Overrideprotected void onUpdate(AjaxRequestTarget target) {if (SecurityUtils.getUser() != null && getQuerySaveSupport() != null)- target.add(querySave);+ target.add(others);}});@@ -376,7 +365,7 @@ public abstract class IssueListPanel extends Panel {elseadd(new WebMarkupContainer("newIssue").setVisible(false));- others.add(batchEditSelected = new ModalLink("batchEditSelected") {+ others.add(new ModalLink("batchEditSelected") {@Overrideprotected Component newContent(String id, ModalPanel modal) {@@ -429,8 +418,6 @@ public abstract class IssueListPanel extends Panel {});- batchEditSelected.setOutputMarkupPlaceholderTag(true);-others.add(new ModalLink("batchEditAll") {@Override@@ -534,7 +521,7 @@ public abstract class IssueListPanel extends Panel {@Overrideprotected void onSelectionChange(AjaxRequestTarget target) {- target.add(batchEditSelected);+ target.add(others);}});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.cssindex cf9dfc8c1c..4228ea9761 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@@ -20,6 +20,9 @@right: 0;top: 0;}+.issue-list>.head>.others:empty {+ margin-bottom: 0;+}.issue-list>.head>.others>* {margin-right: 16px;color: #666;diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListCssResourceReference.javanew file mode 100644index 0000000000..db07884625--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListCssResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.component.pullrequest.list;++import org.apache.wicket.request.resource.CssResourceReference;++public class PullRequestListCssResourceReference extends CssResourceReference {++ private static final long serialVersionUID = 1L;++ public PullRequestListCssResourceReference() {+ super(PullRequestListCssResourceReference.class, "pull-request-list.css");+ }++}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.htmlnew file mode 100644index 0000000000..0c034d0d8c--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html@@ -0,0 +1,26 @@+<wicket:panel>+ <div class="pull-request-list">+ <div class="head">+ <form wicket:id="query" class="clearable-wrapper">+ <div class="input-group no-autofocus">+ <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control" placeholder="Query and order pull requests here">+ <span class="input-group-btn">+ <button wicket:id="submit" type="submit" class="btn btn-default" title="Query"><i class="fa fa-search"></i></button>+ </span>+ </div>+ </form>+ <a wicket:id="newRequest" class="open-new btn btn-success"><i class="fa fa-plus"></i> New Pull Request</a>+ <div wicket:id="others" class="others">+ <a wicket:id="showSavedQueries" class="show-saved-queries"><i class="fa fa-eye"></i> Show Saved Queries</a>+ <a wicket:id="saveQuery" class="save-query"><i class="fa fa-save"></i> Save Query</a>+ </div>+ </div>+ <div wicket:id="body" class="body">+ <div wicket:id="feedback"></div>+ <table wicket:id="requests" class="table"></table>+ </div>+ </div>+ <wicket:fragment wicket:id="branchFrag">+ <a wicket:id="link"></a>+ </wicket:fragment>+</wicket:panel>\ No newline at end of filediff --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.javanew file mode 100644index 0000000000..90b5565c2b--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java@@ -0,0 +1,396 @@+package io.onedev.server.web.component.pullrequest.list;++import java.util.ArrayList;+import java.util.Iterator;+import java.util.List;++import javax.annotation.Nullable;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.ajax.markup.html.form.AjaxButton;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.event.Broadcast;+import org.apache.wicket.event.IEvent;+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;+import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;+import org.apache.wicket.markup.ComponentTag;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.html.WebMarkupContainer;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.form.TextField;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.markup.repeater.Item;+import org.apache.wicket.markup.repeater.OddEvenItem;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.model.PropertyModel;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;++import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;+import io.onedev.commons.utils.StringUtils;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.PullRequestManager;+import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;+import io.onedev.server.search.entity.pullrequest.PullRequestQuery;+import io.onedev.server.util.DateUtils;+import io.onedev.server.util.SecurityUtils;+import io.onedev.server.web.WebConstants;+import io.onedev.server.web.behavior.PullRequestQueryBehavior;+import io.onedev.server.web.component.branch.BranchLink;+import io.onedev.server.web.component.datatable.HistoryAwareDataTable;+import io.onedev.server.web.component.pullrequest.summary.PullRequestSummaryPanel;+import io.onedev.server.web.component.savedquery.SavedQueriesClosed;+import io.onedev.server.web.component.savedquery.SavedQueriesOpened;+import io.onedev.server.web.model.EntityModel;+import io.onedev.server.web.page.project.pullrequests.create.NewPullRequestPage;+import io.onedev.server.web.util.PagingHistorySupport;+import io.onedev.server.web.util.QueryPosition;+import io.onedev.server.web.util.QuerySaveSupport;++@SuppressWarnings("serial")+public class PullRequestListPanel extends Panel {++ private static final Logger logger = LoggerFactory.getLogger(PullRequestListPanel.class);++ private final IModel<Project> projectModel;++ private final String query;++ private IModel<PullRequestQuery> parsedQueryModel = new LoadableDetachableModel<PullRequestQuery>() {++ @Override+ protected PullRequestQuery load() {+ try {+ PullRequestQuery parsedQuery = PullRequestQuery.parse(getProject(), query);+ if (SecurityUtils.getUser() == null && parsedQuery.needsLogin())+ error("Please login to perform this query");+ else+ return parsedQuery;+ } catch (Exception e) {+ logger.error("Error parsing pull request query: " + query, e);+ error(e.getMessage());+ }+ return null;+ }++ };++ private DataTable<PullRequest, Void> requestsTable;++ public PullRequestListPanel(String id, @Nullable Project project, @Nullable String query) {+ super(id);++ projectModel = project!=null?new EntityModel<Project>(project):Model.of((Project)null);+ this.query = query;+ }++ private PullRequestManager getPullRequestManager() {+ return OneDev.getInstance(PullRequestManager.class);+ }++ @Nullable+ protected PagingHistorySupport getPagingHistorySupport() {+ return null;+ }++ protected void onQueryUpdated(AjaxRequestTarget target, @Nullable String query) {+ }++ @Nullable+ protected QuerySaveSupport getQuerySaveSupport() {+ return null;+ }++ @Override+ protected void onDetach() {+ parsedQueryModel.detach();+ projectModel.detach();+ super.onDetach();+ }++ @Nullable+ private Project getProject() {+ return projectModel.getObject();+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ WebMarkupContainer others = new WebMarkupContainer("others");+ others.setOutputMarkupId(true);++ add(others);++ others.add(new AjaxLink<Void>("showSavedQueries") {++ @Override+ public void onEvent(IEvent<?> event) {+ super.onEvent(event);+ if (event.getPayload() instanceof SavedQueriesClosed) {+ ((SavedQueriesClosed) event.getPayload()).getHandler().add(others);+ }+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getQuerySaveSupport() != null && !getQuerySaveSupport().isSavedQueriesVisible());+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ send(getPage(), Broadcast.BREADTH, new SavedQueriesOpened(target));+ target.add(others);+ }++ });++ others.add(new AjaxLink<Void>("saveQuery") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setEnabled(StringUtils.isNotBlank(query));+ setVisible(SecurityUtils.getUser() != null);+ }++ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);+ configure();+ if (!isEnabled()) {+ tag.put("disabled", "disabled");+ tag.put("title", "Input query to save");+ }+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ getQuerySaveSupport().onSaveQuery(target, query);+ }++ });++ TextField<String> input = new TextField<String>("input", new PropertyModel<String>(this, "query"));+ input.add(new PullRequestQueryBehavior(new AbstractReadOnlyModel<Project>() {++ @Override+ public Project getObject() {+ return getProject();+ }++ }));+ input.add(new AjaxFormComponentUpdatingBehavior("input"){++ @Override+ protected void onUpdate(AjaxRequestTarget target) {+ if (SecurityUtils.getUser() != null)+ target.add(others);+ }++ });++ WebMarkupContainer body = new WebMarkupContainer("body");+ add(body.setOutputMarkupId(true));++ Form<?> form = new Form<Void>("query");+ form.add(input);+ form.add(new AjaxButton("submit") {++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);+ target.add(body);+ onQueryUpdated(target, query);+ }++ });+ add(form);++ if (getProject() != null) {+ add(new BookmarkablePageLink<Void>("newRequest", NewPullRequestPage.class,+ NewPullRequestPage.paramsOf(getProject())) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.canReadCode(getProject()));+ }++ });+ } else {+ add(new WebMarkupContainer("newRequest").setVisible(false));+ }++ body.add(new NotificationPanel("feedback", this));++ List<IColumn<PullRequest, Void>> columns = new ArrayList<>();++ columns.add(new AbstractColumn<PullRequest, Void>(Model.of("")) {++ @Override+ public void populateItem(Item<ICellPopulator<PullRequest>> cellItem, String componentId, IModel<PullRequest> rowModel) {+ cellItem.add(new Label(componentId, ""));+ }++ @Override+ public String getCssClass() {+ return "new-indicator";+ }++ });++ columns.add(new AbstractColumn<PullRequest, Void>(Model.of("Summary")) {++ @Override+ public void populateItem(Item<ICellPopulator<PullRequest>> cellItem, String componentId, IModel<PullRequest> rowModel) {+ cellItem.add(new PullRequestSummaryPanel(componentId, rowModel) {++ @Override+ protected QueryPosition getQueryPosition() {+ OddEvenItem<?> row = cellItem.findParent(OddEvenItem.class);+ return new QueryPosition(parsedQueryModel.getObject().toString(), (int)requestsTable.getItemCount(),+ (int)requestsTable.getCurrentPage() * WebConstants.PAGE_SIZE + row.getIndex());+ }++ });+ }++ @Override+ public String getCssClass() {+ return "summary";+ }++ });++ if (getProject() == null) {+ columns.add(new AbstractColumn<PullRequest, Void>(Model.of("Target")) {++ @Override+ public void populateItem(Item<ICellPopulator<PullRequest>> cellItem, String componentId, IModel<PullRequest> rowModel) {+ Fragment fragment = new Fragment(componentId, "branchFrag", PullRequestListPanel.this);+ fragment.add(new BranchLink("link", rowModel.getObject().getTarget(), rowModel.getObject()));+ cellItem.add(fragment);+ }++ @Override+ public String getCssClass() {+ return "target expanded";+ }++ });+ }++ columns.add(new AbstractColumn<PullRequest, Void>(Model.of("Source")) {++ @Override+ public void populateItem(Item<ICellPopulator<PullRequest>> cellItem, String componentId, IModel<PullRequest> rowModel) {+ if (rowModel.getObject().getSource() != null) {+ Fragment fragment = new Fragment(componentId, "branchFrag", PullRequestListPanel.this);+ fragment.add(new BranchLink("link", rowModel.getObject().getSource(), rowModel.getObject()));+ cellItem.add(fragment);+ } else {+ cellItem.add(new Label(componentId, "<i>Unknown</i>").setEscapeModelStrings(false));+ }+ }++ @Override+ public String getCssClass() {+ return "source expanded";+ }++ });++ columns.add(new AbstractColumn<PullRequest, Void>(Model.of("Last Update")) {++ @Override+ public void populateItem(Item<ICellPopulator<PullRequest>> cellItem, String componentId, IModel<PullRequest> rowModel) {+ PullRequest request = rowModel.getObject();+ cellItem.add(new Label(componentId, DateUtils.formatAge(request.getUpdateDate())));+ }++ @Override+ public String getCssClass() {+ return "last-update expanded";+ }++ });++ SortableDataProvider<PullRequest, Void> dataProvider = new SortableDataProvider<PullRequest, Void>() {++ private Integer count;++ @Override+ public void detach() {+ count = null;+ }++ @Override+ public Iterator<? extends PullRequest> iterator(long first, long count) {+ return getPullRequestManager().query(getProject(), SecurityUtils.getUser(),+ parsedQueryModel.getObject(), (int)first, (int)count).iterator();+ }++ @Override+ public long size() {+ if (count == null) {+ PullRequestQuery parsedQuery = parsedQueryModel.getObject();+ if (parsedQuery != null)+ count = getPullRequestManager().count(getProject(), SecurityUtils.getUser(), parsedQuery.getCriteria());+ else+ count = 0;+ }+ return count;+ }++ @Override+ public IModel<PullRequest> model(PullRequest object) {+ Long requestId = object.getId();+ return new LoadableDetachableModel<PullRequest>() {++ @Override+ protected PullRequest load() {+ return getPullRequestManager().load(requestId);+ }++ };+ }++ };++ body.add(requestsTable = new HistoryAwareDataTable<PullRequest, Void>("requests", columns, dataProvider,+ WebConstants.PAGE_SIZE, getPagingHistorySupport()) {++ @Override+ protected Item<PullRequest> newRowItem(String id, int index, IModel<PullRequest> model) {+ Item<PullRequest> item = super.newRowItem(id, index, model);+ PullRequest request = model.getObject();+ item.add(AttributeAppender.append("class",+ request.isVisitedAfter(request.getUpdateDate())?"request":"request new"));+ return item;+ }+ });++ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new PullRequestListCssResourceReference()));+ }++}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.cssnew file mode 100644index 0000000000..167e06e292--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/pull-request-list.css@@ -0,0 +1,40 @@+.pull-request-list>.head {+ position: relative;+}+.pull-request-list>.head>* {+ margin-bottom: 20px;+}+.pull-request-list>.head>form {+ margin-right: 170px;+}+.pull-request-list>.head>.open-new {+ position: absolute;+ right: 0;+ top: 0;+}+.pull-request-list>.head>.others:empty {+ margin-bottom: 0;+}+.pull-request-list>.head>.others>* {+ margin-right: 16px;+ color: #666;+}+.pull-request-list>.head>.others>*:last-child {+ margin-right: 0;+}+.pull-request-list>.body .new-indicator {+ width: 4px;+ padding: 0;+}+.pull-request-list>.body td a {+ color: #444;+}++.pull-request-list>.body tr.request.new td.new-indicator {+ background: #4667EE;+}+@media(max-width: 991px) {+ .pull-request-list thead, .pull-request-list td.expanded {+ display: none;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.javaindex ee6c45ded2..5bdf47e572 100644--- a/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.java@@ -316,7 +316,6 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {QuerySetting<T> querySetting = getQuerySetting();querySetting.getQueryWatchSupport().setUserWatchStatus(namedQuery, watchStatus);onSaveQuerySetting(querySetting);-}@Override@@ -342,9 +341,7 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {querySetting.getQuerySubscriptionSupport().getUserQuerySubscriptions().add(namedQuery.getName());elsequerySetting.getQuerySubscriptionSupport().getUserQuerySubscriptions().remove(namedQuery.getName());-onSaveQuerySetting(querySetting);-}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/issue/IssueListPage.html b/server-core/src/main/java/io/onedev/server/web/page/issue/IssueListPage.htmlindex 06e8e18d0c..af0edf252f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/issue/IssueListPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/issue/IssueListPage.html@@ -1,4 +1,5 @@<wicket:extend>+ <div class="page-title">Issues</div><div id="issue-list"><div wicket:id="workflowChangeAlert"></div><div class="query-save-support">diff --git a/server-core/src/main/java/io/onedev/server/web/page/issue/IssueListPage.java b/server-core/src/main/java/io/onedev/server/web/page/issue/IssueListPage.javaindex 3565126269..d6ee4172df 100644--- a/server-core/src/main/java/io/onedev/server/web/page/issue/IssueListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/issue/IssueListPage.java@@ -16,7 +16,6 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.entitymanager.UserManager;-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.administration.IssueSetting;@@ -105,12 +104,16 @@ public class IssueListPage extends LayoutPage {@Overrideprotected QuerySetting<NamedIssueQuery> getQuerySetting() {- return getLoginUser().getIssueQuerySetting();+ if (getLoginUser() != null)+ return getLoginUser().getIssueQuerySetting();+ else+ return null;}@Overrideprotected void onSaveQuerySetting(QuerySetting<NamedIssueQuery> querySetting) {- OneDev.getInstance(UserManager.class).save((User) querySetting);+ getLoginUser().setIssueQuerySetting(querySetting);+ OneDev.getInstance(UserManager.class).save(getLoginUser());}@Override@@ -183,20 +186,14 @@ public class IssueListPage extends LayoutPage {@Overrideprotected void onSaveForAll(AjaxRequestTarget target, String name) {IssueSetting issueSetting = getIssueSetting();- NamedIssueQuery namedQuery = null;- for (NamedIssueQuery each: issueSetting.getNamedQueries()) {- if (each.getName().equals(name)) {- namedQuery = each;- break;- }- }+ NamedIssueQuery namedQuery = issueSetting.getNamedQuery(name);if (namedQuery == null) {namedQuery = new NamedIssueQuery(name, query);issueSetting.getNamedQueries().add(namedQuery);} else {namedQuery.setQuery(query);}- OneDev.getInstance(SettingManager.class).saveIssueSetting(getIssueSetting());+ OneDev.getInstance(SettingManager.class).saveIssueSetting(issueSetting);target.add(savedQueries);close();}diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.htmlindex d380a115f7..ecfb217b4c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html@@ -19,6 +19,7 @@<ul class="nav navbar-nav tabs"><li wicket:id="navProjects"><a wicket:id="link">Projects</a></li><li wicket:id="navIssues"><a wicket:id="link">Issues</a></li>+ <li wicket:id="navPullRequests"><a wicket:id="link">Pull Requests</a></li><li wicket:id="navContributions"><a wicket:id="link"><span wicket:id="label"></span></a></li><li wicket:id="navAdministration" class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Administration <i class="fa fa-angle-down"></i></a>diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.javaindex 705a7f7dd5..68119ae3e9 100644--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java@@ -57,6 +57,7 @@ import io.onedev.server.web.page.my.MyTokenPage;import io.onedev.server.web.page.project.NewProjectPage;import io.onedev.server.web.page.project.ProjectListPage;import io.onedev.server.web.page.project.ProjectPage;+import io.onedev.server.web.page.pullrequest.PullRequestListPage;import io.onedev.server.web.page.security.LoginPage;import io.onedev.server.web.page.security.LogoutPage;import io.onedev.server.web.page.security.RegisterPage;@@ -84,11 +85,17 @@ public abstract class LayoutPage extends BasePage {WebMarkupContainer issuesContainer = new WebMarkupContainer("navIssues");issuesContainer.add(new ViewStateAwarePageLink<Void>("link", IssueListPage.class, IssueListPage.paramsOf("", 0)));-if (getPage() instanceof IssueListPage)issuesContainer.add(AttributeAppender.append("class", "active"));add(issuesContainer);+ WebMarkupContainer pullRequestsContainer = new WebMarkupContainer("navPullRequests");+ pullRequestsContainer.add(new ViewStateAwarePageLink<Void>("link", PullRequestListPage.class,+ PullRequestListPage.paramsOf("", 0)));+ if (getPage() instanceof PullRequestListPage)+ pullRequestsContainer.add(AttributeAppender.append("class", "active"));+ add(pullRequestsContainer);+RepeatingView contributionsView = new RepeatingView("navContributions");List<MainNavContribution> contributions = new ArrayList<>();for (MainNavContribution contribution: OneDev.getExtensions(MainNavContribution.class)) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.javaindex 7cdb210a7c..6603356293 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java@@ -25,6 +25,7 @@ import io.onedev.commons.utils.matchscore.MatchScoreUtils;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.Project;+import io.onedev.server.security.permission.AccessProject;import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.behavior.OnTypingDoneBehavior;import io.onedev.server.web.component.project.list.ProjectListPanel;@@ -77,7 +78,7 @@ public class ProjectListPage extends LayoutPage {@Overrideprotected List<Project> load() {List<Project> projects = new ArrayList<>(OneDev.getInstance(ProjectManager.class)- .getAccessibleProjects(getLoginUser()));+ .getPermittedProjects(getLoginUser(), new AccessProject()));projects.sort(Project::compareLastVisit);return MatchScoreUtils.filterAndSort(projects, new MatchScoreProvider<Project>() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.javaindex 8668524cd7..feaad7bbeb 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java@@ -14,11 +14,14 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.BuildQuerySettingManager;import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.BuildQuerySetting;import io.onedev.server.model.Project;import io.onedev.server.model.support.NamedBuildQuery;import io.onedev.server.model.support.NamedQuery;+import io.onedev.server.model.support.ProjectBuildSetting;import io.onedev.server.model.support.QuerySetting;+import io.onedev.server.model.support.administration.BuildSetting;import io.onedev.server.search.entity.build.BuildQuery;import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.component.build.list.BuildListPanel;@@ -48,7 +51,7 @@ public class ProjectBuildsPage extends ProjectPage {for (NamedBuildQuery namedQuery: getProject().getBuildQuerySettingOfCurrentUser().getUserQueries())queries.add(namedQuery.getQuery());}- for (NamedBuildQuery namedQuery: getProject().getNamedBuildQueries())+ for (NamedBuildQuery namedQuery: getProject().getBuildSetting().getNamedQueries(true))queries.add(namedQuery.getQuery());query = null;for (String each: queries) {@@ -67,6 +70,10 @@ public class ProjectBuildsPage extends ProjectPage {return OneDev.getInstance(BuildQuerySettingManager.class);}+ protected BuildSetting getBuildSetting() {+ return OneDev.getInstance(SettingManager.class).getBuildSetting();+ }+@Overrideprotected void onInitialize() {super.onInitialize();@@ -97,7 +104,7 @@ public class ProjectBuildsPage extends ProjectPage {@Overrideprotected ArrayList<NamedBuildQuery> getQueries() {- return getProject().getNamedBuildQueries();+ return (ArrayList<NamedBuildQuery>) getProject().getBuildSetting().getNamedQueries(false);}@Override@@ -106,11 +113,16 @@ public class ProjectBuildsPage extends ProjectPage {}@Override- protected void onSaveQueries(ArrayList<NamedBuildQuery> projectQueries) {- getProject().setNamedBuildQueries(projectQueries);+ protected void onSaveQueries(ArrayList<NamedBuildQuery> namedQueries) {+ getProject().getBuildSetting().setNamedQueries(namedQueries);OneDev.getInstance(ProjectManager.class).save(getProject());}+ @Override+ protected ArrayList<NamedBuildQuery> getDefaultQueries() {+ return (ArrayList<NamedBuildQuery>) getBuildSetting().getNamedQueries();+ }+});PagingHistorySupport pagingHistorySupport = new PagingHistorySupport() {@@ -170,10 +182,13 @@ public class ProjectBuildsPage extends ProjectPage {@Overrideprotected void onSaveForAll(AjaxRequestTarget target, String name) {- NamedBuildQuery namedQuery = NamedQuery.find(getProject().getNamedBuildQueries(), name);+ ProjectBuildSetting setting = getProject().getBuildSetting();+ if (setting.getNamedQueries(false) == null)+ setting.setNamedQueries(new ArrayList<>(getBuildSetting().getNamedQueries()));+ NamedBuildQuery namedQuery = getProject().getBuildSetting().getNamedQuery(name);if (namedQuery == null) {namedQuery = new NamedBuildQuery(name, query);- getProject().getNamedBuildQueries().add(namedQuery);+ setting.getNamedQueries(false).add(namedQuery);} else {namedQuery.setQuery(query);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.javaindex d7adf0e21b..84cef81cf2 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.java@@ -43,6 +43,7 @@ public class ProjectIssueListPage extends ProjectIssuesPage {public ProjectIssueListPage(PageParameters params) {super(params);+query = params.get(PARAM_QUERY).toOptionalString();if (query != null && query.length() == 0) {query = null;@@ -108,8 +109,8 @@ public class ProjectIssueListPage extends ProjectIssuesPage {}@Override- protected void onSaveQueries(ArrayList<NamedIssueQuery> projectQueries) {- getProject().getIssueSetting().setNamedQueries(projectQueries);+ protected void onSaveQueries(ArrayList<NamedIssueQuery> namedQueries) {+ getProject().getIssueSetting().setNamedQueries(namedQueries);OneDev.getInstance(ProjectManager.class).save(getProject());}@@ -178,13 +179,12 @@ public class ProjectIssueListPage extends ProjectIssuesPage {@Overrideprotected void onSaveForAll(AjaxRequestTarget target, String name) {ProjectIssueSetting setting = getProject().getIssueSetting();- if (setting.getNamedQueries(false) == null) {+ if (setting.getNamedQueries(false) == null)setting.setNamedQueries(new ArrayList<>(getIssueSetting().getNamedQueries()));- }- NamedIssueQuery namedQuery = getProject().getIssueSetting().getNamedQuery(name);+ NamedIssueQuery namedQuery = setting.getNamedQuery(name);if (namedQuery == null) {namedQuery = new NamedIssueQuery(name, query);- getProject().getIssueSetting().getNamedQueries(true).add(namedQuery);+ setting.getNamedQueries(false).add(namedQuery);} else {namedQuery.setQuery(query);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsCssResourceReference.javaindex dd99ef29dc..46f8b7f7f1 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsCssResourceReference.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsCssResourceReference.java@@ -7,7 +7,7 @@ public class ProjectPullRequestsCssResourceReference extends CssResourceReferencprivate static final long serialVersionUID = 1L;public ProjectPullRequestsCssResourceReference() {- super(ProjectPullRequestsCssResourceReference.class, "project-pullrequests.css");+ super(ProjectPullRequestsCssResourceReference.class, "project-pull-requests.css");}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.htmlindex e083e3dc20..be66bba036 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.html@@ -1,30 +1,7 @@<wicket:extend><div class="page-title">Pull Requests</div>- <div id="project-pullrequests" class="query-save-support">+ <div id="project-pull-requests" class="query-save-support"><div wicket:id="side" class="side"></div>- <div class="main">- <div class="head">- <form wicket:id="query" class="clearable-wrapper">- <div class="input-group no-autofocus">- <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control" placeholder="Query and order pull requests here">- <span class="input-group-btn">- <button wicket:id="submit" type="submit" class="btn btn-default" title="Query"><i class="fa fa-search"></i></button>- </span>- </div>- </form>- <a wicket:id="newRequest" class="open-new btn btn-success"><i class="fa fa-plus"></i> New Pull Request</a>- <div wicket:id="others" class="others clearfix">- <a wicket:id="showSavedQueries" class="show-saved-queries pull-left"><i class="fa fa-eye"></i> Show Saved Queries</a>- <a wicket:id="saveQuery" class="pull-left save-query"><i class="fa fa-save"></i> Save Query</a>- </div>- </div>- <div class="body">- <div wicket:id="feedback"></div>- <table wicket:id="requests" class="table"></table>- </div>- </div>+ <div wicket:id="main" class="main"></div></div>- <wicket:fragment wicket:id="sourceFrag">- <a wicket:id="link"></a>- </wicket:fragment></wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.javaindex 79fc3ed7b9..1b7e87a311 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java@@ -1,109 +1,50 @@package io.onedev.server.web.page.project.pullrequests;import java.util.ArrayList;-import java.util.Iterator;import java.util.List;import javax.annotation.Nullable;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.ajax.markup.html.form.AjaxButton;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.event.Broadcast;-import org.apache.wicket.event.IEvent;-import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;-import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;-import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;-import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;-import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;-import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.markup.html.form.TextField;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.markup.repeater.OddEvenItem;-import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.model.PropertyModel;import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.slf4j.Logger;-import org.slf4j.LoggerFactory;-import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;-import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.entitymanager.PullRequestManager;import io.onedev.server.entitymanager.PullRequestQuerySettingManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Project;-import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestQuerySetting;import io.onedev.server.model.support.NamedQuery;import io.onedev.server.model.support.QuerySetting;+import io.onedev.server.model.support.administration.PullRequestSetting;import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;+import io.onedev.server.model.support.pullrequest.ProjectPullRequestSetting;import io.onedev.server.search.entity.pullrequest.PullRequestQuery;-import io.onedev.server.util.DateUtils;import io.onedev.server.util.SecurityUtils;-import io.onedev.server.web.WebConstants;-import io.onedev.server.web.behavior.PullRequestQueryBehavior;-import io.onedev.server.web.component.branch.BranchLink;-import io.onedev.server.web.component.datatable.HistoryAwareDataTable;import io.onedev.server.web.component.modal.ModalPanel;-import io.onedev.server.web.component.pullrequest.summary.PullRequestSummaryPanel;+import io.onedev.server.web.component.pullrequest.list.PullRequestListPanel;import io.onedev.server.web.component.savedquery.NamedQueriesBean;import io.onedev.server.web.component.savedquery.SaveQueryPanel;-import io.onedev.server.web.component.savedquery.SavedQueriesClosed;-import io.onedev.server.web.component.savedquery.SavedQueriesOpened;import io.onedev.server.web.component.savedquery.SavedQueriesPanel;import io.onedev.server.web.page.project.ProjectPage;-import io.onedev.server.web.page.project.pullrequests.create.NewPullRequestPage;+import io.onedev.server.web.util.NamedPullRequestQueriesBean;import io.onedev.server.web.util.PagingHistorySupport;-import io.onedev.server.web.util.QueryPosition;-import io.onedev.server.web.util.VisibleVisitor;+import io.onedev.server.web.util.QuerySaveSupport;@SuppressWarnings("serial")public class ProjectPullRequestsPage extends ProjectPage {- private static final Logger logger = LoggerFactory.getLogger(ProjectPullRequestsPage.class);-private static final String PARAM_CURRENT_PAGE = "currentPage";private static final String PARAM_QUERY = "query";- private IModel<PullRequestQuery> parsedQueryModel = new LoadableDetachableModel<PullRequestQuery>() {-- @Override- protected PullRequestQuery load() {- try {- PullRequestQuery parsedQuery = PullRequestQuery.parse(getProject(), query);- if (SecurityUtils.getUser() == null && parsedQuery.needsLogin())- error("Please login to perform this query");- else- return parsedQuery;- } catch (Exception e) {- logger.error("Error parsing pull request query: " + query, e);- error(e.getMessage());- }- return null;- }-- };-private String query;- private DataTable<PullRequest, Void> requestsTable;-public ProjectPullRequestsPage(PageParameters params) {super(params);query = params.get(PARAM_QUERY).toOptionalString();@@ -114,7 +55,7 @@ public class ProjectPullRequestsPage extends ProjectPage {for (NamedPullRequestQuery namedQuery: getProject().getPullRequestQuerySettingOfCurrentUser().getUserQueries())queries.add(namedQuery.getQuery());}- for (NamedPullRequestQuery namedQuery: getProject().getNamedPullRequestQueries())+ for (NamedPullRequestQuery namedQuery: getProject().getPullRequestSetting().getNamedQueries(true))queries.add(namedQuery.getQuery());for (String each: queries) {try {@@ -132,16 +73,10 @@ public class ProjectPullRequestsPage extends ProjectPage {return OneDev.getInstance(PullRequestQuerySettingManager.class);}- private PullRequestManager getPullRequestManager() {- return OneDev.getInstance(PullRequestManager.class);+ protected PullRequestSetting getPullRequestSetting() {+ return OneDev.getInstance(SettingManager.class).getPullRequestSetting();}- @Override- protected void onDetach() {- parsedQueryModel.detach();- super.onDetach();- }-@Overrideprotected void onInitialize() {super.onInitialize();@@ -172,315 +107,119 @@ public class ProjectPullRequestsPage extends ProjectPage {@Overrideprotected ArrayList<NamedPullRequestQuery> getQueries() {- return getProject().getNamedPullRequestQueries();+ return (ArrayList<NamedPullRequestQuery>) getProject().getPullRequestSetting().getNamedQueries(false);}+ @Override+ protected ArrayList<NamedPullRequestQuery> getDefaultQueries() {+ return (ArrayList<NamedPullRequestQuery>) getPullRequestSetting().getNamedQueries();+ }+@Overrideprotected void onSaveQuerySetting(QuerySetting<NamedPullRequestQuery> querySetting) {getPullRequestQuerySettingManager().save((PullRequestQuerySetting) querySetting);}@Override- protected void onSaveQueries(ArrayList<NamedPullRequestQuery> projectQueries) {- getProject().setNamedPullRequestQueries(projectQueries);+ protected void onSaveQueries(ArrayList<NamedPullRequestQuery> namedQueries) {+ getProject().getPullRequestSetting().setNamedQueries(namedQueries);OneDev.getInstance(ProjectManager.class).save(getProject());}});- WebMarkupContainer others = new WebMarkupContainer("others") {+ PagingHistorySupport pagingHistorySupport = new PagingHistorySupport() {@Override- protected void onConfigure() {- super.onConfigure();- setVisible(visitChildren(Component.class, new VisibleVisitor()) != null);+ public PageParameters newPageParameters(int currentPage) {+ PageParameters params = paramsOf(getProject(), query, 0);+ params.add(PARAM_CURRENT_PAGE, currentPage+1);+ return params;}- };-- add(others);-- others.add(new AjaxLink<Void>("showSavedQueries") {-- @Override- public void onEvent(IEvent<?> event) {- super.onEvent(event);- if (event.getPayload() instanceof SavedQueriesClosed) {- ((SavedQueriesClosed) event.getPayload()).getHandler().add(this);- }- }-- @Override- protected void onConfigure() {- super.onConfigure();- savedQueries.configure();- setVisible(!savedQueries.isVisible());- }-@Override- public void onClick(AjaxRequestTarget target) {- send(getPage(), Broadcast.BREADTH, new SavedQueriesOpened(target));- target.add(this);+ public int getCurrentPage() {+ return getPageParameters().get(PARAM_CURRENT_PAGE).toInt(1)-1;}- }.setOutputMarkupPlaceholderTag(true));-- Component querySave;- others.add(querySave = new AjaxLink<Void>("saveQuery") {+ };++ add(new PullRequestListPanel("main", getProject(), query) {@Override- protected void onConfigure() {- super.onConfigure();- setEnabled(StringUtils.isNotBlank(query));- setVisible(SecurityUtils.getUser() != null);+ protected PagingHistorySupport getPagingHistorySupport() {+ return pagingHistorySupport;}@Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);- configure();- if (!isEnabled()) {- tag.put("disabled", "disabled");- tag.put("title", "Input query to save");- }+ protected void onQueryUpdated(AjaxRequestTarget target, String query) {+ setResponsePage(ProjectPullRequestsPage.class, paramsOf(getProject(), query, 0));}@Override- public void onClick(AjaxRequestTarget target) {- new ModalPanel(target) {+ protected QuerySaveSupport getQuerySaveSupport() {+ return new QuerySaveSupport() {@Override- protected Component newContent(String id) {- return new SaveQueryPanel(id) {+ public void onSaveQuery(AjaxRequestTarget target, String query) {+ new ModalPanel(target) {@Override- protected void onSaveForMine(AjaxRequestTarget target, String name) {- PullRequestQuerySetting setting = getProject().getPullRequestQuerySettingOfCurrentUser();- NamedPullRequestQuery namedQuery = NamedQuery.find(setting.getUserQueries(), name);- if (namedQuery == null) {- namedQuery = new NamedPullRequestQuery(name, query);- setting.getUserQueries().add(namedQuery);- } else {- namedQuery.setQuery(query);- }- getPullRequestQuerySettingManager().save(setting);- target.add(savedQueries);- close();- }-- @Override- protected void onSaveForAll(AjaxRequestTarget target, String name) {- NamedPullRequestQuery namedQuery = NamedQuery.find(getProject().getNamedPullRequestQueries(), name);- if (namedQuery == null) {- namedQuery = new NamedPullRequestQuery(name, query);- getProject().getNamedPullRequestQueries().add(namedQuery);- } else {- namedQuery.setQuery(query);- }- OneDev.getInstance(ProjectManager.class).save(getProject());- target.add(savedQueries);- close();- }-- @Override- protected void onCancel(AjaxRequestTarget target) {- close();+ protected Component newContent(String id) {+ return new SaveQueryPanel(id) {++ @Override+ protected void onSaveForMine(AjaxRequestTarget target, String name) {+ PullRequestQuerySetting setting = getProject().getPullRequestQuerySettingOfCurrentUser();+ NamedPullRequestQuery namedQuery = NamedQuery.find(setting.getUserQueries(), name);+ if (namedQuery == null) {+ namedQuery = new NamedPullRequestQuery(name, query);+ setting.getUserQueries().add(namedQuery);+ } else {+ namedQuery.setQuery(query);+ }+ getPullRequestQuerySettingManager().save(setting);+ target.add(savedQueries);+ close();+ }++ @Override+ protected void onSaveForAll(AjaxRequestTarget target, String name) {+ ProjectPullRequestSetting setting = getProject().getPullRequestSetting();+ if (setting.getNamedQueries(false) == null)+ setting.setNamedQueries(new ArrayList<>(getPullRequestSetting().getNamedQueries()));+ NamedPullRequestQuery namedQuery = setting.getNamedQuery(name);+ if (namedQuery == null) {+ namedQuery = new NamedPullRequestQuery(name, query);+ setting.getNamedQueries(false).add(namedQuery);+ } else {+ namedQuery.setQuery(query);+ }+ OneDev.getInstance(ProjectManager.class).save(getProject());+ target.add(savedQueries);+ close();+ }++ @Override+ protected void onCancel(AjaxRequestTarget target) {+ close();+ }++ };}};}-- };- }-- });-- TextField<String> input = new TextField<String>("input", new PropertyModel<String>(this, "query"));- input.add(new PullRequestQueryBehavior(new AbstractReadOnlyModel<Project>() {-- @Override- public Project getObject() {- return getProject();- }-- }));- input.add(new AjaxFormComponentUpdatingBehavior("input"){-- @Override- protected void onUpdate(AjaxRequestTarget target) {- if (SecurityUtils.getUser() != null)- target.add(querySave);- }-- });-- Form<?> form = new Form<Void>("query");- form.add(input);- form.add(new AjaxButton("submit") {-- @Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);- setResponsePage(ProjectPullRequestsPage.class, paramsOf(getProject(), query, 0));- }-- });- add(form);-- add(new BookmarkablePageLink<Void>("newRequest", NewPullRequestPage.class, NewPullRequestPage.paramsOf(getProject())) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(SecurityUtils.canReadCode(getProject()));- }-- });-- add(new NotificationPanel("feedback", this));-- List<IColumn<PullRequest, Void>> columns = new ArrayList<>();-- columns.add(new AbstractColumn<PullRequest, Void>(Model.of("")) {-- @Override- public void populateItem(Item<ICellPopulator<PullRequest>> cellItem, String componentId, IModel<PullRequest> rowModel) {- cellItem.add(new Label(componentId, ""));- }-- @Override- public String getCssClass() {- return "new-indicator";- }-- });-- columns.add(new AbstractColumn<PullRequest, Void>(Model.of("Summary")) {-- @Override- public void populateItem(Item<ICellPopulator<PullRequest>> cellItem, String componentId, IModel<PullRequest> rowModel) {- cellItem.add(new PullRequestSummaryPanel(componentId, rowModel) {-- @Override- protected QueryPosition getQueryPosition() {- OddEvenItem<?> row = cellItem.findParent(OddEvenItem.class);- return new QueryPosition(parsedQueryModel.getObject().toString(), (int)requestsTable.getItemCount(),- (int)requestsTable.getCurrentPage() * WebConstants.PAGE_SIZE + row.getIndex());- }-- });- }-- @Override- public String getCssClass() {- return "summary";- }-- });-- columns.add(new AbstractColumn<PullRequest, Void>(Model.of("Source")) {-- @Override- public void populateItem(Item<ICellPopulator<PullRequest>> cellItem, String componentId, IModel<PullRequest> rowModel) {- if (rowModel.getObject().getSource() != null) {- Fragment fragment = new Fragment(componentId, "sourceFrag", ProjectPullRequestsPage.this);- fragment.add(new BranchLink("link", rowModel.getObject().getSource(), rowModel.getObject()));- cellItem.add(fragment);- } else {- cellItem.add(new Label(componentId, "<i>Unknown</i>").setEscapeModelStrings(false));- }- }-- @Override- public String getCssClass() {- return "source expanded";- }-- });-- columns.add(new AbstractColumn<PullRequest, Void>(Model.of("Last Update")) {-- @Override- public void populateItem(Item<ICellPopulator<PullRequest>> cellItem, String componentId, IModel<PullRequest> rowModel) {- PullRequest request = rowModel.getObject();- cellItem.add(new Label(componentId, DateUtils.formatAge(request.getUpdateDate())));- }-- @Override- public String getCssClass() {- return "last-update expanded";- }-- });-- SortableDataProvider<PullRequest, Void> dataProvider = new SortableDataProvider<PullRequest, Void>() {-- private Integer count;-- @Override- public void detach() {- count = null;- }-- @Override- public Iterator<? extends PullRequest> iterator(long first, long count) {- return getPullRequestManager().query(getProject(), getLoginUser(), parsedQueryModel.getObject(), (int)first, (int)count).iterator();- }-- @Override- public long size() {- if (count == null) {- PullRequestQuery parsedQuery = parsedQueryModel.getObject();- if (parsedQuery != null)- count = getPullRequestManager().count(getProject(), getLoginUser(), parsedQuery.getCriteria());- else- count = 0;- }- return count;- }-- @Override- public IModel<PullRequest> model(PullRequest object) {- Long requestId = object.getId();- return new LoadableDetachableModel<PullRequest>() {@Override- protected PullRequest load() {- return getPullRequestManager().load(requestId);+ public boolean isSavedQueriesVisible() {+ savedQueries.configure();+ return savedQueries.isVisible();}};}- };-- PagingHistorySupport pagingHistorySupport = new PagingHistorySupport() {-- @Override- public PageParameters newPageParameters(int currentPage) {- PageParameters params = paramsOf(getProject(), query, 0);- params.add(PARAM_CURRENT_PAGE, currentPage+1);- return params;- }-- @Override- public int getCurrentPage() {- return getPageParameters().get(PARAM_CURRENT_PAGE).toInt(1)-1;- }-- };-- add(requestsTable = new HistoryAwareDataTable<PullRequest, Void>("requests", columns, dataProvider,- WebConstants.PAGE_SIZE, pagingHistorySupport) {-- @Override- protected Item<PullRequest> newRowItem(String id, int index, IModel<PullRequest> model) {- Item<PullRequest> item = super.newRowItem(id, index, model);- PullRequest request = model.getObject();- item.add(AttributeAppender.append("class",- request.isVisitedAfter(request.getUpdateDate())?"request":"request new"));- return item;- }});}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.htmlindex 6a1d730bd8..74d0aebf3b 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@@ -25,23 +25,23 @@<div wicket:id="requestSummary" class="summary"><div wicket:id="checkError" class="alert alert-danger"></div><div wicket:id="discardedNote" class="discarded alert alert-danger">- <i class="fa fa-info-circle"></i> This pull request has been discarded.+ This pull request has been discarded</div><div wicket:id="mergedNote" class="merged-note alert alert-success"><div wicket:id="fastForwarded">- <i class="fa fa-info-circle"></i> Target branch was fast-forwarded to source branch+ Target branch was fast-forwarded to source branch</div><div wicket:id="merged">- <i class="fa fa-info-circle"></i> Commits were merged into target branch+ Commits were merged into target branch</div><div wicket:id="mergedOutside">- <i class="fa fa-info-circle"></i> Commits were merged into target branch by someone outside of this pull request+ Commits were merged into target branch by someone outside of this pull request</div><div wicket:id="squashed">- <i class="fa fa-info-circle"></i> Commits were squashed into a single commit in target branch+ Commits were squashed into a single commit in target branch</div><div wicket:id="rebased">- <i class="fa fa-info-circle"></i> Commits were rebased onto target branch+ Commits were rebased onto target branch</div></div><div wicket:id="mergeStatus" class="merge-status">diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/project-pull-requests.css b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/project-pull-requests.cssnew file mode 100644index 0000000000..d4b201ba76--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/project-pull-requests.css@@ -0,0 +1,3 @@+#project-pull-requests>.main {+ min-width: 330px;+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/project-pullrequests.css b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/project-pullrequests.cssdeleted file mode 100644index 5fac00085c..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/project-pullrequests.css+++ /dev/null@@ -1,40 +0,0 @@-#project-pullrequests>.main {- min-width: 330px;-}-#project-pullrequests>.main>.head {- position: relative;-}-#project-pullrequests>.main>.head>* {- margin-bottom: 20px;-}-#project-pullrequests>.main>.head>form {- margin-right: 170px;-}-#project-pullrequests>.main>.head>.open-new {- position: absolute;- right: 0;- top: 0;-}-#project-pullrequests>.main>.head>.others>* {- margin-right: 16px;- color: #666;-}-#project-pullrequests>.main>.head>.others>*:last-child {- margin-right: 0;-}-#project-pullrequests>.main>.body .new-indicator {- width: 4px;- padding: 0;-}-#project-pullrequests>.main>.body td a {- color: #444;-}--#project-pullrequests>.main>.body tr.request.new td.new-indicator {- background: #4667EE;-}-@media(max-width: 991px) {- #project-pullrequests thead, #project-pullrequests td.expanded {- display: none;- }-}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildSettingPage.javaindex 9e9e307c73..e43151dacd 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildSettingPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildSettingPage.java@@ -5,7 +5,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;-import io.onedev.server.model.support.BuildSetting;+import io.onedev.server.model.support.ProjectBuildSetting;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.page.project.setting.ProjectSettingPage;@@ -20,7 +20,7 @@ public class BuildSettingPage extends ProjectSettingPage {protected void onInitialize() {super.onInitialize();- BuildSetting buildSetting = getProject().getBuildSetting();+ ProjectBuildSetting buildSetting = getProject().getBuildSetting();Form<?> form = new Form<Void>("form") {diff --git a/server-core/src/main/java/io/onedev/server/web/page/pullrequest/PullRequestListCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/pullrequest/PullRequestListCssResourceReference.javanew file mode 100644index 0000000000..050b37c1b8--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/pullrequest/PullRequestListCssResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.page.pullrequest;++import org.apache.wicket.request.resource.CssResourceReference;++public class PullRequestListCssResourceReference extends CssResourceReference {++ private static final long serialVersionUID = 1L;++ public PullRequestListCssResourceReference() {+ super(PullRequestListCssResourceReference.class, "pull-request-list.css");+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/pullrequest/PullRequestListPage.html b/server-core/src/main/java/io/onedev/server/web/page/pullrequest/PullRequestListPage.htmlnew file mode 100644index 0000000000..4b36365d29--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/pullrequest/PullRequestListPage.html@@ -0,0 +1,7 @@+<wicket:extend>+ <div class="page-title">Pull Requests</div>+ <div id="pull-request-list" class="query-save-support">+ <div wicket:id="side" class="side"></div>+ <div wicket:id="main" class="main"></div>+ </div>+</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/pullrequest/PullRequestListPage.java b/server-core/src/main/java/io/onedev/server/web/page/pullrequest/PullRequestListPage.javanew file mode 100644index 0000000000..98628dbb5d--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/pullrequest/PullRequestListPage.java@@ -0,0 +1,231 @@+package io.onedev.server.web.page.pullrequest;++import java.util.ArrayList;+import java.util.List;++import javax.annotation.Nullable;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.model.support.NamedQuery;+import io.onedev.server.model.support.QuerySetting;+import io.onedev.server.model.support.administration.PullRequestSetting;+import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;+import io.onedev.server.search.entity.pullrequest.PullRequestQuery;+import io.onedev.server.util.SecurityUtils;+import io.onedev.server.web.component.modal.ModalPanel;+import io.onedev.server.web.component.pullrequest.list.PullRequestListPanel;+import io.onedev.server.web.component.savedquery.NamedQueriesBean;+import io.onedev.server.web.component.savedquery.SaveQueryPanel;+import io.onedev.server.web.component.savedquery.SavedQueriesPanel;+import io.onedev.server.web.page.layout.LayoutPage;+import io.onedev.server.web.util.NamedPullRequestQueriesBean;+import io.onedev.server.web.util.PagingHistorySupport;+import io.onedev.server.web.util.QuerySaveSupport;++@SuppressWarnings("serial")+public class PullRequestListPage extends LayoutPage {++ private static final String PARAM_CURRENT_PAGE = "currentPage";++ private static final String PARAM_QUERY = "query";++ private String query;++ public PullRequestListPage(PageParameters params) {+ super(params);+ query = params.get(PARAM_QUERY).toOptionalString();+ if (query != null && query.length() == 0) {+ query = null;+ List<String> queries = new ArrayList<>();+ if (getLoginUser() != null) {+ for (NamedPullRequestQuery namedQuery: getLoginUser().getPullRequestQuerySetting().getUserQueries())+ queries.add(namedQuery.getQuery());+ }+ for (NamedPullRequestQuery namedQuery: getPullRequestSetting().getNamedQueries())+ queries.add(namedQuery.getQuery());++ for (String each: queries) {+ try {+ if (SecurityUtils.getUser() != null || !PullRequestQuery.parse(null, each).needsLogin()) {+ query = each;+ break;+ }+ } catch (Exception e) {+ }+ }+ }+ }++ protected PullRequestSetting getPullRequestSetting() {+ return OneDev.getInstance(SettingManager.class).getPullRequestSetting();+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ SavedQueriesPanel<NamedPullRequestQuery> savedQueries;+ add(savedQueries = new SavedQueriesPanel<NamedPullRequestQuery>("side") {++ @Override+ protected NamedQueriesBean<NamedPullRequestQuery> newNamedQueriesBean() {+ return new NamedPullRequestQueriesBean();+ }++ @Override+ protected boolean needsLogin(NamedPullRequestQuery namedQuery) {+ return PullRequestQuery.parse(null, namedQuery.getQuery()).needsLogin();+ }++ @Override+ protected Link<Void> newQueryLink(String componentId, NamedPullRequestQuery namedQuery) {+ return new BookmarkablePageLink<Void>(componentId, PullRequestListPage.class,+ PullRequestListPage.paramsOf(namedQuery.getQuery(), 0));+ }++ @Override+ protected QuerySetting<NamedPullRequestQuery> getQuerySetting() {+ if (getLoginUser() != null)+ return getLoginUser().getPullRequestQuerySetting();+ else+ return null;+ }++ @Override+ protected void onSaveQuerySetting(QuerySetting<NamedPullRequestQuery> querySetting) {+ getLoginUser().setPullRequestQuerySetting(querySetting);+ OneDev.getInstance(UserManager.class).save(getLoginUser());+ }++ @Override+ protected void onSaveQueries(ArrayList<NamedPullRequestQuery> queries) {+ getPullRequestSetting().setNamedQueries(queries);+ OneDev.getInstance(SettingManager.class).savePullRequestSetting(getPullRequestSetting());+ }++ @Override+ protected ArrayList<NamedPullRequestQuery> getQueries() {+ return (ArrayList<NamedPullRequestQuery>) getPullRequestSetting().getNamedQueries();+ }++ });++ PagingHistorySupport pagingHistorySupport = new PagingHistorySupport() {++ @Override+ public PageParameters newPageParameters(int currentPage) {+ PageParameters params = paramsOf(query, 0);+ params.add(PARAM_CURRENT_PAGE, currentPage+1);+ return params;+ }++ @Override+ public int getCurrentPage() {+ return getPageParameters().get(PARAM_CURRENT_PAGE).toInt(1)-1;+ }++ };++ add(new PullRequestListPanel("main", null, query) {++ @Override+ protected PagingHistorySupport getPagingHistorySupport() {+ return pagingHistorySupport;+ }++ @Override+ protected void onQueryUpdated(AjaxRequestTarget target, String query) {+ setResponsePage(PullRequestListPage.class, paramsOf(query, 0));+ }++ @Override+ protected QuerySaveSupport getQuerySaveSupport() {+ return new QuerySaveSupport() {++ @Override+ public void onSaveQuery(AjaxRequestTarget target, String query) {+ new ModalPanel(target) {++ @Override+ protected Component newContent(String id) {+ return new SaveQueryPanel(id) {++ @Override+ protected void onSaveForMine(AjaxRequestTarget target, String name) {+ NamedPullRequestQuery namedQuery = NamedQuery.find(getLoginUser().getPullRequestQuerySetting().getUserQueries(), name);+ if (namedQuery == null) {+ namedQuery = new NamedPullRequestQuery(name, query);+ getLoginUser().getPullRequestQuerySetting().getUserQueries().add(namedQuery);+ } else {+ namedQuery.setQuery(query);+ }+ OneDev.getInstance(UserManager.class).save(getLoginUser());+ target.add(savedQueries);+ close();+ }++ @Override+ protected void onSaveForAll(AjaxRequestTarget target, String name) {+ PullRequestSetting pullRequestSetting = getPullRequestSetting();+ NamedPullRequestQuery namedQuery = pullRequestSetting.getNamedQuery(name);+ if (namedQuery == null) {+ namedQuery = new NamedPullRequestQuery(name, query);+ pullRequestSetting.getNamedQueries().add(namedQuery);+ } else {+ namedQuery.setQuery(query);+ }+ OneDev.getInstance(SettingManager.class).savePullRequestSetting(pullRequestSetting);+ target.add(savedQueries);+ close();+ }++ @Override+ protected void onCancel(AjaxRequestTarget target) {+ close();+ }++ };+ }++ };+ }++ @Override+ public boolean isSavedQueriesVisible() {+ savedQueries.configure();+ return savedQueries.isVisible();+ }++ };+ }++ });++ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new PullRequestListCssResourceReference()));+ }++ public static PageParameters paramsOf(@Nullable String query, int page) {+ PageParameters params = new PageParameters();+ if (query != null)+ params.add(PARAM_QUERY, query);+ if (page != 0)+ params.add(PARAM_CURRENT_PAGE, page);+ return params;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/pullrequest/pull-request-list.css b/server-core/src/main/java/io/onedev/server/web/page/pullrequest/pull-request-list.cssnew file mode 100644index 0000000000..f371b4750d--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/pullrequest/pull-request-list.css@@ -0,0 +1,6 @@+#pull-request-list>.main {+ min-width: 360px;+}+#layout>.body>#pull-request-list .pull-request-list>.head>form {+ margin-right: 0;+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/NamedPullRequestQueriesBean.java b/server-core/src/main/java/io/onedev/server/web/util/NamedPullRequestQueriesBean.javasimilarity index 93%rename from server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/NamedPullRequestQueriesBean.javarename to server-core/src/main/java/io/onedev/server/web/util/NamedPullRequestQueriesBean.javaindex fb507d3dfa..caaacd6210 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/NamedPullRequestQueriesBean.java+++ b/server-core/src/main/java/io/onedev/server/web/util/NamedPullRequestQueriesBean.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.pullrequests;+package io.onedev.server.web.util;import java.util.ArrayList;import java.util.List;diff --git a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.javaindex efcfe8bc65..54d7538048 100644--- a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java+++ b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java@@ -47,6 +47,7 @@ import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;import io.onedev.server.model.support.Secret;import io.onedev.server.model.support.administration.GroovyScript;+import io.onedev.server.security.permission.AccessProject;import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.scriptidentity.ScriptIdentity;import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;@@ -82,7 +83,7 @@ public class SuggestionUtils {int numSuggestions = 0;List<InputSuggestion> suggestions = new ArrayList<>();User user = SecurityUtils.getUser();- for (Project project: OneDev.getInstance(ProjectManager.class).getAccessibleProjects(user)) {+ for (Project project: OneDev.getInstance(ProjectManager.class).getPermittedProjects(user, new AccessProject())) {int index = project.getName().toLowerCase().indexOf(matchWith);if (index != -1 && numSuggestions++<InputAssistBehavior.MAX_SUGGESTIONS)suggestions.add(new InputSuggestion(project.getName(), new LinearRange(index, index+matchWith.length())));diff --git a/server-core/src/test/java/io/onedev/server/entityquery/issue/IssueQueryGrammarTest.java b/server-core/src/test/java/io/onedev/server/entityquery/issue/IssueQueryGrammarTest.javaindex 98abd3e248..a399197f60 100644--- a/server-core/src/test/java/io/onedev/server/entityquery/issue/IssueQueryGrammarTest.java+++ b/server-core/src/test/java/io/onedev/server/entityquery/issue/IssueQueryGrammarTest.java@@ -48,11 +48,11 @@ public class IssueQueryGrammarTest {assertEquals(1, suggestions.size());assertEquals("\"Date\" is before \"2018-09-01 2:30PM\":36", suggestions.get(0).toString());- suggestions = codeAssist.suggest(new InputStatus("outstanding", 11), "query");+ suggestions = codeAssist.suggest(new InputStatus("mine", 4), "query");assertEquals(3, suggestions.size());- assertEquals("outstanding:11", suggestions.get(0).toString());- assertEquals("\"outstanding\" :14", suggestions.get(1).toString());- assertEquals("outstanding :12", suggestions.get(2).toString());+ assertEquals("mine:4", suggestions.get(0).toString());+ assertEquals("\"mine\" :7", suggestions.get(1).toString());+ assertEquals("mine :5", suggestions.get(2).toString());}}