The Unified and Autonomous Development Platform
Add global build list
Robin Shen21ab7125618d
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.javaindex 3999c6f40a..7e116d08d2 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java@@ -37,9 +37,9 @@ public interface BuildManager extends EntityManager<Build> {List<Build> query(Project project, @Nullable User user, String term, int count);- List<Build> query(Project project, @Nullable User user, EntityQuery<Build> buildQuery, int firstResult, int maxResults);+ List<Build> query(@Nullable Project project, @Nullable User user, EntityQuery<Build> buildQuery, int firstResult, int maxResults);- int count(Project project, @Nullable User user, EntityCriteria<Build> buildCriteria);+ int count(@Nullable Project project, @Nullable User user, EntityCriteria<Build> buildCriteria);Collection<Long> getBuildIdsByProject(Long projectId);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.javaindex 6afb4ec327..6c52196f64 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java@@ -15,6 +15,7 @@ import java.util.concurrent.locks.ReadWriteLock;import java.util.concurrent.locks.ReentrantReadWriteLock;import java.util.stream.Collectors;+import javax.annotation.Nullable;import javax.inject.Inject;import javax.inject.Singleton;import javax.persistence.criteria.CriteriaBuilder;@@ -25,6 +26,7 @@ import javax.persistence.criteria.Predicate;import javax.persistence.criteria.Root;import org.apache.commons.lang3.StringUtils;+import org.apache.shiro.subject.Subject;import org.eclipse.jgit.errors.MissingObjectException;import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.revwalk.RevCommit;@@ -79,6 +81,7 @@ import io.onedev.server.search.entity.EntitySort.Direction;import io.onedev.server.search.entity.build.BuildQuery;import io.onedev.server.security.permission.ManageProject;import io.onedev.server.security.permission.ProjectPermission;+import io.onedev.server.security.permission.SystemAdministration;import io.onedev.server.storage.StorageManager;import io.onedev.server.util.BuildConstants;import io.onedev.server.util.facade.BuildFacade;@@ -307,16 +310,34 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implementsbuildDependenceManager.save(dependence);}- private Predicate[] getPredicates(io.onedev.server.search.entity.EntityCriteria<Build> criteria, Project project,- Root<Build> root, CriteriaBuilder builder, User user) {+ private Predicate[] getPredicates(io.onedev.server.search.entity.EntityCriteria<Build> criteria,+ @Nullable Project project, Root<Build> root, CriteriaBuilder builder, @Nullable User user) {List<Predicate> predicates = new ArrayList<>();- predicates.add(builder.equal(root.get(BuildConstants.ATTR_PROJECT), project));- if (!User.asSubject(user).isPermitted(new ProjectPermission(project, new ManageProject()))) {- List<Predicate> jobPredicates = new ArrayList<>();- for (String jobName: getAccessibleJobNames(project, user))- jobPredicates.add(builder.equal(root.get(BuildConstants.ATTR_JOB), jobName));- predicates.add(builder.or(jobPredicates.toArray(new Predicate[jobPredicates.size()])));+ Subject subject = User.asSubject(user);+ if (project != null) {+ predicates.add(builder.equal(root.get(BuildConstants.ATTR_PROJECT), project));+ if (!subject.isPermitted(new ProjectPermission(project, new ManageProject()))) {+ List<Predicate> jobPredicates = new ArrayList<>();+ for (String jobName: getAccessibleJobNames(project, user))+ jobPredicates.add(builder.equal(root.get(BuildConstants.ATTR_JOB), jobName));+ predicates.add(builder.or(jobPredicates.toArray(new Predicate[jobPredicates.size()])));+ }+ } else if (!subject.isPermitted(new SystemAdministration())) {+ List<Predicate> projectPredicates = new ArrayList<>();+ for (Map.Entry<Project, Collection<String>> entry: getAccessibleJobNames(user).entrySet()) {+ if (subject.isPermitted(new ProjectPermission(project, new ManageProject()))) {+ projectPredicates.add(builder.equal(root.get(BuildConstants.ATTR_PROJECT), entry.getKey()));+ } else {+ List<Predicate> jobPredicates = new ArrayList<>();+ for (String jobName: entry.getValue())+ jobPredicates.add(builder.equal(root.get(BuildConstants.ATTR_JOB), jobName));+ projectPredicates.add(builder.and(+ builder.equal(root.get(BuildConstants.ATTR_PROJECT), entry.getKey()),+ builder.or(jobPredicates.toArray(new Predicate[jobPredicates.size()]))));+ }+ }+ predicates.add(builder.or(projectPredicates.toArray(new Predicate[projectPredicates.size()])));}if (criteria != null)@@ -324,7 +345,8 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implementsreturn predicates.toArray(new Predicate[0]);}- private CriteriaQuery<Build> buildCriteriaQuery(Session session, Project project, EntityQuery<Build> buildQuery, User user) {+ private CriteriaQuery<Build> buildCriteriaQuery(Session session, @Nullable Project project,+ EntityQuery<Build> buildQuery, @Nullable User user) {CriteriaBuilder builder = session.getCriteriaBuilder();CriteriaQuery<Build> query = builder.createQuery(Build.class);Root<Build> root = query.from(Build.class);@@ -349,8 +371,8 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implements@Sessional@Override- public List<Build> query(Project project, User user, EntityQuery<Build> buildQuery, int firstResult,- int maxResults) {+ public List<Build> query(@Nullable Project project, @Nullable User user,+ EntityQuery<Build> buildQuery, int firstResult, int maxResults) {CriteriaQuery<Build> criteriaQuery = buildCriteriaQuery(getSession(), project, buildQuery, user);Query<Build> query = getSession().createQuery(criteriaQuery);query.setFirstResult(firstResult);@@ -360,7 +382,8 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implements@Sessional@Override- public int count(Project project, User user, io.onedev.server.search.entity.EntityCriteria<Build> buildCriteria) {+ public int count(@Nullable Project project, @Nullable User user,+ io.onedev.server.search.entity.EntityCriteria<Build> buildCriteria) {CriteriaBuilder builder = getSession().getCriteriaBuilder();CriteriaQuery<Long> criteriaQuery = builder.createQuery(Long.class);Root<Build> root = criteriaQuery.from(Build.class);@@ -616,37 +639,37 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implementsreturn accessibleJobNames;}- private void populateAccessibleJobNames(Map<Long, Collection<String>> accessibleJobNames, Map<Long, Collection<String>> jobNames,- Project project, Role role) {+ private void populateAccessibleJobNames(Map<Project, Collection<String>> accessibleJobNames,+ Map<Long, Collection<String>> jobNames, Project project, Role role) {Collection<String> jobNamesOfProject = jobNames.get(project.getId());if (jobNamesOfProject != null) {Collection<String> accessibleJobNamesOfProject = getAccessibleJobNames(role, jobNamesOfProject);- Collection<String> currentAccessibleJobNamesOfProject = accessibleJobNames.get(project.getId());+ Collection<String> currentAccessibleJobNamesOfProject = accessibleJobNames.get(project);if (currentAccessibleJobNamesOfProject == null) {currentAccessibleJobNamesOfProject = new HashSet<>();- accessibleJobNames.put(project.getId(), currentAccessibleJobNamesOfProject);+ accessibleJobNames.put(project, currentAccessibleJobNamesOfProject);}currentAccessibleJobNamesOfProject.addAll(accessibleJobNamesOfProject);}}- private Map<Long, Collection<String>> getAccessibleJobNames(User user) {+ private Map<Project, Collection<String>> getAccessibleJobNames(User user) {Map<Long, Collection<String>> jobNames = new HashMap<>();buildsLock.readLock().lock();try {for (BuildFacade build: builds.values()) {- Collection<String> jobNamesOfBuild = jobNames.get(build.getId());- if (jobNamesOfBuild == null) {- jobNamesOfBuild = new HashSet<>();- jobNames.put(build.getId(), jobNamesOfBuild);+ Collection<String> jobNamesOfProject = jobNames.get(build.getProjectId());+ if (jobNamesOfProject == null) {+ jobNamesOfProject = new HashSet<>();+ jobNames.put(build.getId(), jobNamesOfProject);}- jobNamesOfBuild.add(build.getJobName());+ jobNamesOfProject.add(build.getJobName());}} finally {buildsLock.readLock().unlock();}- Map<Long, Collection<String>> accessibleJobNames = new HashMap<>();+ Map<Project, Collection<String>> accessibleJobNames = new HashMap<>();if (user != null) {for (UserAuthorization authorization: user.getProjectAuthorizations())populateAccessibleJobNames(accessibleJobNames, jobNames, authorization.getProject(), authorization.getRole());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 0e15adcbc5..5d87149328 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@@ -70,8 +70,8 @@ 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.security.permission.SystemAdministration;import io.onedev.server.util.IssueConstants;-import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.ValueSetEdit;import io.onedev.server.util.facade.IssueFacade;import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;@@ -179,7 +179,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementsList<Predicate> predicates = new ArrayList<>();if (project != null) {predicates.add(builder.equal(root.get("project"), project));- } else if (!SecurityUtils.isAdministrator()) {+ } else if (!User.asSubject(user).isPermitted(new SystemAdministration())) {List<Predicate> projectPredicates = new ArrayList<>();for (Project each: projectManager.getPermittedProjects(user, new AccessProject()))projectPredicates.add(builder.equal(root.get(IssueConstants.ATTR_PROJECT), each));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 4d15b6a1d8..926a56f414 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@@ -124,6 +124,7 @@ 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.SystemAdministration;import io.onedev.server.security.permission.WriteCode;import io.onedev.server.util.PullRequestConstants;import io.onedev.server.util.SecurityUtils;@@ -956,7 +957,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestList<Predicate> predicates = new ArrayList<>();if (targetProject != null) {predicates.add(builder.equal(root.get("targetProject"), targetProject));- } else if (!SecurityUtils.isAdministrator()) {+ } else if (!User.asSubject(user).isPermitted(new SystemAdministration())) {List<Predicate> targetProjectPredicates = new ArrayList<>();for (Project each: projectManager.getPermittedProjects(user, new ReadCode()))targetProjectPredicates.add(builder.equal(root.get(PullRequestConstants.ATTR_TARGET_PROJECT), each));diff --git a/server-core/src/main/java/io/onedev/server/model/Role.java b/server-core/src/main/java/io/onedev/server/model/Role.javaindex 9175c398f5..0aad35d3e3 100644--- a/server-core/src/main/java/io/onedev/server/model/Role.java+++ b/server-core/src/main/java/io/onedev/server/model/Role.java@@ -75,7 +75,9 @@ public class Role extends AbstractEntity implements Permission {@OneToMany(mappedBy="role", cascade=CascadeType.REMOVE)private Collection<GroupAuthorization> groupAuthorizations = new ArrayList<>();- @Editable(order=100)+ @Editable(order=100, description="Specify name of the role. <b style='color:red'>NOTE: </b> "+ + "Permission to view issues will be granted implicitly even if no other permissions "+ + "are specified here")@NotEmptypublic String getName() {return name;diff --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 62e067c9d6..60ac44beb3 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@@ -189,24 +189,6 @@ public class User extends AbstractEntity implements AuthenticationInfo {};}- 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>() {diff --git a/server-core/src/main/java/io/onedev/server/model/support/role/JobPrivilege.java b/server-core/src/main/java/io/onedev/server/model/support/role/JobPrivilege.javaindex 441e691ecd..13ed1fb58a 100644--- a/server-core/src/main/java/io/onedev/server/model/support/role/JobPrivilege.java+++ b/server-core/src/main/java/io/onedev/server/model/support/role/JobPrivilege.java@@ -31,7 +31,9 @@ public class JobPrivilege implements Serializable {private String accessibleReports;- @Editable(order=100, description="Specify space-separated jobs. Use * or ? for wildcard match")+ @Editable(order=100, description="Specify space-separated jobs. Use * or ? for wildcard match. "+ + "<b style='color:red'>NOTE: </b> Permission to access build artifacts will be granted "+ + "implicitly in matched jobs even if no other permissions are specified here")@Patterns(suggester = "suggestJobNames")@NotEmptypublic String getJobNames() {@@ -95,7 +97,7 @@ public class JobPrivilege implements Serializable {return !(boolean) EditContext.get().getInputValue("accessLog");}- @Editable(order=400, description="Specify space-separated reports. Use * or ? for wildcard match")+ @Editable(order=400, name="Access Build Reports", description="Specify space-separated reports. Use * or ? for wildcard match")@ShowCondition("isAccessLogDisabled")@Patternspublic String getAccessibleReports() {diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.javaindex 11a615d894..124c64e34c 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java@@ -66,7 +66,7 @@ public class BuildQuery extends EntityQuery<Build> {this(null, new ArrayList<>());}- public static BuildQuery parse(Project project, @Nullable String queryString) {+ public static BuildQuery parse(@Nullable Project project, @Nullable String queryString) {if (queryString != null) {CharStream is = CharStreams.fromString(queryString);BuildQueryLexer lexer = new BuildQueryLexer(is);@@ -138,17 +138,32 @@ public class BuildQuery extends EntityQuery<Build> {} else if (ctx.CancelledBy() != null) {return new CancelledByCriteria(getUser(value), value);} else if (ctx.FixedIssue() != null) {- return new FixedIssueCriteria(getIssue(project, value));+ if (project != null)+ return new FixedIssueCriteria(getIssue(project, value));+ else+ throw new OneException("Unsupported criteria in global build query: " + getRuleName(BuildQueryLexer.FixedIssue));} else if (ctx.DependsOn() != null) {- return new DependsOnCriteria(getBuild(project, value));+ if (project != null)+ return new DependsOnCriteria(getBuild(project, value));+ else+ throw new OneException("Unsupported criteria in global build query: " + getRuleName(BuildQueryLexer.DependsOn));} else if (ctx.DependenciesOf() != null) {- return new DependenciesOfCriteria(getBuild(project, value));+ if (project != null)+ return new DependenciesOfCriteria(getBuild(project, value));+ else+ throw new OneException("Unsupported criteria in global build query: " + getRuleName(BuildQueryLexer.DependenciesOf));} else if (ctx.RequiredByPullRequest() != null) {- return new RequiredByPullRequestCriteria(getPullRequest(project, value));+ if (project != null)+ return new RequiredByPullRequestCriteria(getPullRequest(project, value));+ else+ throw new OneException("Unsupported criteria in global build query: " + getRuleName(BuildQueryLexer.RequiredByPullRequest));} else if (ctx.AssociatedWithPullRequest() != null) {- return new AssociatedWithPullRequestCriteria(getPullRequest(project, value));+ if (project != null)+ return new AssociatedWithPullRequestCriteria(getPullRequest(project, value));+ else+ throw new OneException("Unsupported criteria in global build query: " + getRuleName(BuildQueryLexer.AssociatedWithPullRequest));} else {- throw new RuntimeException("Unexpected operator: " + ctx.operator.getText());+ throw new RuntimeException("Unexpected criteria: " + ctx.operator.getText());}}@@ -181,7 +196,10 @@ public class BuildQuery extends EntityQuery<Build> {case BuildQueryLexer.Is:switch (fieldName) {case FIELD_COMMIT:- return new CommitCriteria(getCommitId(project, value));+ if (project != null)+ return new CommitCriteria(getCommitId(project, value));+ else+ throw new OneException("Unable to query by commit in global build query");case FIELD_JOB:return new JobCriteria(value);case FIELD_NUMBER: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 dbc997a963..22ebd1615b 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@@ -162,7 +162,7 @@ public class IssueQuery extends EntityQuery<Issue> {if (project != null)return new FixedInCriteria(getBuild(project, value));else- throw new OneException("Unsupported operator in global issue query: " + getRuleName(IssueQueryLexer.FixedInBuild));+ throw new OneException("Unsupported criteria in global issue query: " + getRuleName(IssueQueryLexer.FixedInBuild));} else {throw new RuntimeException("Unexpected operator: " + ctx.operator.getText());}@@ -183,7 +183,7 @@ public class IssueQuery extends EntityQuery<Issue> {public IssueCriteria visitFixedBetweenCriteria(FixedBetweenCriteriaContext ctx) {if (project == null)- throw new OneException("Unsupported operator in global issue query: " + getRuleName(IssueQueryLexer.FixedBetween));+ throw new OneException("Unsupported criteria in global issue query: " + getRuleName(IssueQueryLexer.FixedBetween));RevisionCriteriaContext sinceRevision = ctx.revisionCriteria(0);int sinceType = sinceRevision.revisionType.getType();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 5265dcf66f..e7ce280847 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@@ -137,12 +137,12 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {if (project != null)return new IncludesCommitCriteria(getCommitId(project, value));else- throw new OneException("Unsupported operator in global issue query: " + getRuleName(PullRequestQueryLexer.IncludesCommit));+ throw new OneException("Unsupported criteria in global issue query: " + getRuleName(PullRequestQueryLexer.IncludesCommit));case PullRequestQueryLexer.IncludesIssue:if (project != null)return new IncludesIssueCriteria(getIssue(project, value));else- throw new OneException("Unsupported operator in global issue query: " + getRuleName(PullRequestQueryLexer.IncludesIssue));+ throw new OneException("Unsupported criteria in global issue query: " + getRuleName(PullRequestQueryLexer.IncludesIssue));default:throw new OneException("Unexpected operator: " + ctx.operator.getText());}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 0b3dad40cc..2a899db20b 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@@ -47,6 +47,7 @@ import io.onedev.server.web.page.admin.user.UserMembershipsPage;import io.onedev.server.web.page.admin.user.UserPasswordPage;import io.onedev.server.web.page.admin.user.UserProfilePage;import io.onedev.server.web.page.admin.user.UserTokenPage;+import io.onedev.server.web.page.build.BuildListPage;import io.onedev.server.web.page.init.ServerInitPage;import io.onedev.server.web.page.issue.IssueListPage;import io.onedev.server.web.page.my.MyAvatarPage;@@ -111,6 +112,7 @@ public class OneUrlMapper extends CompoundRequestMapper {add(new OnePageMapper("loading", BrowserInfoPage.class));add(new OnePageMapper("issues", IssueListPage.class));add(new OnePageMapper("pull-requests", PullRequestListPage.class));+ add(new OnePageMapper("builds", BuildListPage.class));addProjectPages();addMyPages();addAdministrationPages();diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.javaindex d07c2f9716..4384575d44 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java@@ -3,6 +3,8 @@ package io.onedev.server.web.behavior;import java.util.ArrayList;import java.util.List;+import javax.annotation.Nullable;+import org.apache.commons.lang3.StringUtils;import org.apache.wicket.Component;import org.apache.wicket.model.IModel;@@ -26,6 +28,7 @@ import io.onedev.server.search.entity.build.BuildQueryLexer;import io.onedev.server.search.entity.build.BuildQueryParser;import io.onedev.server.util.BuildConstants;import io.onedev.server.util.DateUtils;+import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;import io.onedev.server.web.util.SuggestionUtils;@@ -48,6 +51,7 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {projectModel.detach();}+ @Nullableprivate Project getProject() {return projectModel.getObject();}@@ -127,6 +131,20 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {@Overrideprotected Optional<String> describe(ParseExpect parseExpect, String suggestedLiteral) {+ if ((noLoginSupport || SecurityUtils.getUser() == null)+ && (suggestedLiteral.equals(BuildQuery.getRuleName(BuildQueryLexer.SubmittedByMe))+ || suggestedLiteral.equals(BuildQuery.getRuleName(BuildQueryLexer.CancelledByMe)))) {+ return null;+ }+ if (getProject() == null+ && (suggestedLiteral.equals(BuildQuery.getRuleName(BuildQueryLexer.AssociatedWithPullRequest))+ || suggestedLiteral.equals(BuildQuery.getRuleName(BuildQueryLexer.DependenciesOf))+ || suggestedLiteral.equals(BuildQuery.getRuleName(BuildQueryLexer.DependsOn))+ || suggestedLiteral.equals(BuildQuery.getRuleName(BuildQueryLexer.FixedIssue))+ || suggestedLiteral.equals(BuildQuery.getRuleName(BuildQueryLexer.RequiredByPullRequest)))) {+ return null;+ }+parseExpect = parseExpect.findExpectByLabel("operator");if (parseExpect != null) {List<Element> fieldElements = parseExpect.getState().findMatchedElementsByLabel("criteriaField", false);@@ -138,10 +156,6 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {return null;}}- if (noLoginSupport && (suggestedLiteral.equals(BuildQuery.getRuleName(BuildQueryLexer.SubmittedByMe))- || suggestedLiteral.equals(BuildQuery.getRuleName(BuildQueryLexer.CancelledByMe)))) {- return null;- }}return super.describe(parseExpect, suggestedLiteral);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/branch/picker/AffinalBranchPicker.java b/server-core/src/main/java/io/onedev/server/web/component/branch/picker/AffinalBranchPicker.javaindex 51186d2ce6..3b7b416c1a 100644--- a/server-core/src/main/java/io/onedev/server/web/component/branch/picker/AffinalBranchPicker.java+++ b/server-core/src/main/java/io/onedev/server/web/component/branch/picker/AffinalBranchPicker.java@@ -1,5 +1,9 @@package io.onedev.server.web.component.branch.picker;+import java.util.Collection;+import java.util.Iterator;+import java.util.List;+import javax.annotation.Nullable;import org.apache.wicket.ajax.AjaxRequestTarget;@@ -11,8 +15,8 @@ import org.apache.wicket.model.LoadableDetachableModel;import io.onedev.server.OneDev;import io.onedev.server.model.Project;import io.onedev.server.persistence.dao.Dao;+import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.component.project.ProjectPicker;-import io.onedev.server.web.model.AffinalProjectsModel;@SuppressWarnings("serial")public abstract class AffinalBranchPicker extends Panel {@@ -60,7 +64,20 @@ public abstract class AffinalBranchPicker extends Panel {protected void onInitialize() {super.onInitialize();- add(new ProjectPicker("projectPicker", new AffinalProjectsModel(projectId), projectId) {+ add(new ProjectPicker("projectPicker", new LoadableDetachableModel<Collection<Project>>() {++ @Override+ protected Collection<Project> load() {+ Project project = OneDev.getInstance(Dao.class).load(Project.class, projectId);+ List<Project> affinals = project.getForkRoot().getForkDescendants();+ for (Iterator<Project> it = affinals.iterator(); it.hasNext();) {+ if (!SecurityUtils.canAccess(it.next()))+ it.remove();+ }+ return affinals;+ }++ }, projectId) {@Overrideprotected void onSelect(AjaxRequestTarget target, Project project) {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 53732942a0..d8e322e748 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@@ -66,9 +66,9 @@ import io.onedev.server.web.component.job.JobDefLink;import io.onedev.server.web.component.link.ViewStateAwarePageLink;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.builds.detail.dashboard.BuildDashboardPage;import io.onedev.server.web.page.project.commits.CommitDetailPage;+import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;import io.onedev.server.web.util.PagingHistorySupport;import io.onedev.server.web.util.QueryPosition;import io.onedev.server.web.util.QuerySaveSupport;@@ -78,8 +78,6 @@ public abstract class BuildListPanel extends Panel {private static final Logger logger = LoggerFactory.getLogger(BuildListPanel.class);- private final IModel<Project> projectModel;-private final String query;private IModel<BuildQuery> parsedQueryModel = new LoadableDetachableModel<BuildQuery>() {@@ -107,9 +105,8 @@ public abstract class BuildListPanel extends Panel {private DataTable<Build, Void> buildsTable;- public BuildListPanel(String id, Project project, @Nullable String query) {+ public BuildListPanel(String id, @Nullable String query) {super(id);- this.projectModel = new EntityModel<Project>(project);this.query = query;}@@ -119,14 +116,12 @@ public abstract class BuildListPanel extends Panel {@Overrideprotected void onDetach() {- projectModel.detach();parsedQueryModel.detach();super.onDetach();}- private Project getProject() {- return projectModel.getObject();- }+ @Nullable+ protected abstract Project getProject();protected BuildQuery getBaseQuery() {return new BuildQuery();@@ -144,11 +139,16 @@ public abstract class BuildListPanel extends Panel {protected QuerySaveSupport getQuerySaveSupport() {return null;}-++ @Nullableprivate QueryPosition getQueryPosition(Item<ICellPopulator<Build>> cellItem) {- OddEvenItem<?> row = cellItem.findParent(OddEvenItem.class);- return new QueryPosition(parsedQueryModel.getObject().toString(), (int)buildsTable.getItemCount(),- (int)buildsTable.getCurrentPage() * WebConstants.PAGE_SIZE + row.getIndex());+ if (getProject() != null) {+ OddEvenItem<?> row = cellItem.findParent(OddEvenItem.class);+ return new QueryPosition(parsedQueryModel.getObject().toString(), (int)buildsTable.getItemCount(),+ (int)buildsTable.getCurrentPage() * WebConstants.PAGE_SIZE + row.getIndex());+ } else {+ return null;+ }}@Override@@ -250,7 +250,8 @@ public abstract class BuildListPanel extends Panel {@Overridepublic Iterator<? extends Build> iterator(long first, long count) {- return getBuildManager().query(getProject(), SecurityUtils.getUser(), parsedQueryModel.getObject(), (int)first, (int)count).iterator();+ return getBuildManager().query(getProject(), SecurityUtils.getUser(),+ parsedQueryModel.getObject(), (int)first, (int)count).iterator();}@Override@@ -376,6 +377,29 @@ public abstract class BuildListPanel extends Panel {}});+ if (getProject() == null) {+ columns.add(new AbstractColumn<Build, Void>(Model.of("Project")) {++ @Override+ public void populateItem(Item<ICellPopulator<Build>> cellItem, String componentId,+ IModel<Build> rowModel) {+ Build build = rowModel.getObject();+ Fragment fragment = new Fragment(componentId, "linkFrag", BuildListPanel.this);+ Link<Void> link = new BookmarkablePageLink<Void>("link", ProjectDashboardPage.class,+ ProjectDashboardPage.paramsOf(build.getProject()));+ link.add(new Label("label", build.getProject()));+ fragment.add(link);+ cellItem.add(fragment);+ }++ @Override+ public String getCssClass() {+ return "project";+ }++ });+ }+columns.add(new AbstractColumn<Build, Void>(Model.of(BuildConstants.FIELD_JOB)) {@Override@@ -387,38 +411,51 @@ public abstract class BuildListPanel extends Panel {public void populateItem(Item<ICellPopulator<Build>> cellItem, String componentId,IModel<Build> rowModel) {Build build = rowModel.getObject();- Fragment fragment = new Fragment(componentId, "linkFrag", BuildListPanel.this);- Link<Void> link = new JobDefLink("link", getProject(), build.getCommitId(), build.getJobName());- link.add(new Label("label", build.getJobName()));- fragment.add(link);- cellItem.add(fragment);+ if (SecurityUtils.canReadCode(build.getProject())) {+ Fragment fragment = new Fragment(componentId, "linkFrag", BuildListPanel.this);+ Link<Void> link = new JobDefLink("link", build.getCommitId(), build.getJobName()) {++ @Override+ protected Project getProject() {+ return BuildListPanel.this.getProject();+ }++ };+ link.add(new Label("label", build.getJobName()));+ fragment.add(link);+ cellItem.add(fragment);+ } else {+ cellItem.add(new Label(componentId, build.getJobName()));+ }}});- if (SecurityUtils.canReadCode(getProject())) {- columns.add(new AbstractColumn<Build, Void>(Model.of(BuildConstants.FIELD_COMMIT)) {+ columns.add(new AbstractColumn<Build, Void>(Model.of(BuildConstants.FIELD_COMMIT)) {- @Override- public String getCssClass() {- return "commit expanded";- }+ @Override+ public String getCssClass() {+ return "commit expanded";+ }- @Override- public void populateItem(Item<ICellPopulator<Build>> cellItem, String componentId,- IModel<Build> rowModel) {+ @Override+ public void populateItem(Item<ICellPopulator<Build>> cellItem, String componentId,+ IModel<Build> rowModel) {+ Build build = rowModel.getObject();+ if (SecurityUtils.canReadCode(build.getProject())) {Fragment fragment = new Fragment(componentId, "commitFrag", BuildListPanel.this);- Build build = rowModel.getObject();CommitDetailPage.State commitState = new CommitDetailPage.State();commitState.revision = build.getCommitHash();- PageParameters params = CommitDetailPage.paramsOf(getProject(), commitState);+ PageParameters params = CommitDetailPage.paramsOf(build.getProject(), commitState);Link<Void> hashLink = new ViewStateAwarePageLink<Void>("hashLink", CommitDetailPage.class, params);fragment.add(hashLink);hashLink.add(new Label("hash", GitUtils.abbreviateSHA(build.getCommitHash())));fragment.add(new WebMarkupContainer("copyHash").add(new CopyClipboardBehavior(Model.of(build.getCommitHash()))));cellItem.add(fragment);+ } else {+ cellItem.add(new Label(componentId, GitUtils.abbreviateSHA(build.getCommitHash())));}- });- }+ }+ });columns.add(new AbstractColumn<Build, Void>(Model.of(BuildConstants.FIELD_SUBMIT_DATE)) {diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.javaindex 567c8a6c6e..8d8b02ee22 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java@@ -110,7 +110,14 @@ public abstract class BuildSidePanel extends Panel {general.add(new WebMarkupContainer("copyCommitHash").add(new CopyClipboardBehavior(Model.of(commit.name()))));- Link<Void> jobLink = new JobDefLink("job", getProject(), getBuild().getCommitId(), getBuild().getJobName());+ Link<Void> jobLink = new JobDefLink("job", getBuild().getCommitId(), getBuild().getJobName()) {++ @Override+ protected Project getProject() {+ return BuildSidePanel.this.getProject();+ }++ };jobLink.add(new Label("label", getBuild().getJobName()));general.add(jobLink);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 8e88e41bc8..a2be2c91ac 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@@ -54,7 +54,6 @@ import io.onedev.server.web.component.savedquery.SavedQueriesClosed;import io.onedev.server.web.component.savedquery.SavedQueriesOpened;import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.compare.RevisionComparePage;-import io.onedev.server.web.page.project.pullrequests.ProjectPullRequestsPage;import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPage;import io.onedev.server.web.page.project.pullrequests.detail.changes.PullRequestChangesPage;import io.onedev.server.web.util.PagingHistorySupport;@@ -63,7 +62,7 @@ import io.onedev.server.web.util.QuerySaveSupport;@SuppressWarnings("serial")public abstract class CodeCommentListPanel extends Panel {- private static final Logger logger = LoggerFactory.getLogger(ProjectPullRequestsPage.class);+ private static final Logger logger = LoggerFactory.getLogger(CodeCommentListPanel.class);private static final int MAX_COMMENT_LEN = 75;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 18c7dae47e..35a50d6cec 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@@ -78,14 +78,13 @@ import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.savedquery.SavedQueriesClosed;import io.onedev.server.web.component.savedquery.SavedQueriesOpened;import io.onedev.server.web.component.user.contributoravatars.ContributorAvatars;-import io.onedev.server.web.model.EntityModel;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;@SuppressWarnings("serial")-public class CommitListPanel extends Panel {+public abstract class CommitListPanel extends Panel {private static final Logger logger = LoggerFactory.getLogger(CommitListPanel.class);@@ -93,8 +92,6 @@ public class CommitListPanel extends Panel {private static final int MAX_PAGES = 50;- private final IModel<Project> projectModel;-private final String query;private int currentPage = 1;@@ -232,9 +229,8 @@ public class CommitListPanel extends Panel {private RepeatingView commitsView;- public CommitListPanel(String id, Project project, @Nullable String query) {+ public CommitListPanel(String id, @Nullable String query) {super(id);- this.projectModel = new EntityModel<Project>(project);this.query = query;}@@ -243,13 +239,10 @@ public class CommitListPanel extends Panel {parsedQueryModel.detach();commitsModel.detach();labelsModel.detach();- projectModel.detach();super.onDetach();}- private Project getProject() {- return projectModel.getObject();- }+ protected abstract Project getProject();@Nullableprotected String getCompareWith() {@@ -506,7 +499,7 @@ public class CommitListPanel extends Panel {item = new Fragment(itemId, "commitFrag", this);item.add(new ContributorAvatars("avatar", commit.getAuthorIdent(), commit.getCommitterIdent()));- item.add(new CommitMessagePanel("message", getProject(), new LoadableDetachableModel<RevCommit>() {+ item.add(new CommitMessagePanel("message", new LoadableDetachableModel<RevCommit>() {@Overrideprotected RevCommit load() {@@ -527,7 +520,14 @@ public class CommitListPanel extends Panel {return patterns;}- }));+ }) {++ @Override+ protected Project getProject() {+ return CommitListPanel.this.getProject();+ }++ });RepeatingView labelsView = new RepeatingView("labels");@@ -592,12 +592,17 @@ public class CommitListPanel extends Panel {item.add(new WebMarkupContainer("copyHash").add(new CopyClipboardBehavior(Model.of(commit.name()))));getCommitIdsToQueryStatus().add(commit.copy());- item.add(new CommitStatusPanel("buildStatus", getProject(), commit.copy()) {+ item.add(new CommitStatusPanel("buildStatus", commit.copy()) {@Overrideprotected String getCssClasses() {return "btn btn-default";}++ @Override+ protected Project getProject() {+ return CommitListPanel.this.getProject();+ }});diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/message/CommitMessagePanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/message/CommitMessagePanel.javaindex fb4104ef8f..2e2ec0fd4e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commit/message/CommitMessagePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/message/CommitMessagePanel.java@@ -23,29 +23,25 @@ import io.onedev.commons.utils.Highlighter;import io.onedev.server.git.GitUtils;import io.onedev.server.model.Project;import io.onedev.server.util.CommitMessageTransformer;-import io.onedev.server.web.model.EntityModel;import io.onedev.server.web.page.project.commits.CommitDetailPage;@SuppressWarnings("serial")-public class CommitMessagePanel extends Panel {+public abstract class CommitMessagePanel extends Panel {- private final EntityModel<Project> projectModel;-private final IModel<RevCommit> commitModel;private final IModel<List<Pattern>> highlightPatternsModel;- public CommitMessagePanel(String id, Project project,- IModel<RevCommit> commitModel, IModel<List<Pattern>> highlightPatternsModel) {+ public CommitMessagePanel(String id, IModel<RevCommit> commitModel,+ IModel<List<Pattern>> highlightPatternsModel) {super(id);- this.projectModel = new EntityModel<Project>(project);this.commitModel = commitModel;this.highlightPatternsModel = highlightPatternsModel;}- public CommitMessagePanel(String id, Project project, IModel<RevCommit> commitModel) {- this(id, project, commitModel, new LoadableDetachableModel<List<Pattern>>() {+ public CommitMessagePanel(String id, IModel<RevCommit> commitModel) {+ this(id, commitModel, new LoadableDetachableModel<List<Pattern>>() {@Overrideprotected List<Pattern> load() {@@ -74,9 +70,7 @@ public class CommitMessagePanel extends Panel {});}- private Project getProject() {- return projectModel.getObject();- }+ protected abstract Project getProject();private RevCommit getCommit() {return commitModel.getObject();@@ -134,7 +128,6 @@ public class CommitMessagePanel extends Panel {@Overrideprotected void onDetach() {- projectModel.detach();commitModel.detach();highlightPatternsModel.detach();diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.javaindex f47a2c662f..05dbb7f253 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java@@ -40,16 +40,13 @@ import io.onedev.server.web.component.floating.FloatingPanel;import io.onedev.server.web.component.job.JobDefLink;import io.onedev.server.web.component.job.RunJobLink;import io.onedev.server.web.component.link.DropdownLink;-import io.onedev.server.web.model.EntityModel;import io.onedev.server.web.page.project.builds.ProjectBuildsPage;@SuppressWarnings("serial")-public class CommitStatusPanel extends Panel {+public abstract class CommitStatusPanel extends Panel {private static final Logger logger = LoggerFactory.getLogger(CommitStatusPanel.class);- private final IModel<Project> projectModel;-private final ObjectId commitId;private final IModel<List<Job>> jobsModel = new LoadableDetachableModel<List<Job>>() {@@ -78,16 +75,12 @@ public class CommitStatusPanel extends Panel {};- public CommitStatusPanel(String id, Project project, ObjectId commitId) {+ public CommitStatusPanel(String id, ObjectId commitId) {super(id);-- this.projectModel = new EntityModel<Project>(project);this.commitId = commitId;}- private Project getProject() {- return projectModel.getObject();- }+ protected abstract Project getProject();@Overrideprotected void onInitialize() {@@ -105,17 +98,29 @@ public class CommitStatusPanel extends Panel {WebMarkupContainer jobItem = new WebMarkupContainer(jobsView.newChildId());Status status = getProject().getCommitStatus(commitId).get(job.getName());- Link<Void> defLink = new JobDefLink("name", getProject(), commitId, job.getName());+ Link<Void> defLink = new JobDefLink("name", commitId, job.getName()) {++ @Override+ protected Project getProject() {+ return CommitStatusPanel.this.getProject();+ }++ };defLink.add(new Label("label", job.getName()));jobItem.add(defLink);- jobItem.add(new RunJobLink("run", getProject(), commitId, job.getName()) {+ jobItem.add(new RunJobLink("run", commitId, job.getName()) {@Overridepublic void onClick(AjaxRequestTarget target) {super.onClick(target);dropdown.close();}++ @Override+ protected Project getProject() {+ return CommitStatusPanel.this.getProject();+ }});@@ -203,7 +208,6 @@ public class CommitStatusPanel extends Panel {@Overrideprotected void onDetach() {- projectModel.detach();jobsModel.detach();statusModel.detach();super.onDetach();diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.javaindex 71997c19b5..76ebc122f6 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/commits/IssueCommitsPanel.java@@ -18,6 +18,7 @@ import org.eclipse.jgit.revwalk.RevCommit;import io.onedev.server.git.GitUtils;import io.onedev.server.model.Issue;+import io.onedev.server.model.Project;import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior;import io.onedev.server.web.component.commit.message.CommitMessagePanel;@@ -47,7 +48,14 @@ public class IssueCommitsPanel extends GenericPanel<Issue> {@Overrideprotected void populateItem(ListItem<RevCommit> item) {RevCommit commit = item.getModelObject();- item.add(new CommitMessagePanel("message", getIssue().getProject(), item.getModel()));+ item.add(new CommitMessagePanel("message", item.getModel()) {++ @Override+ protected Project getProject() {+ return getIssue().getProject();+ }++ });CommitDetailPage.State commitState = new CommitDetailPage.State();commitState.revision = commit.name();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 f641d3b1c3..fbfbb7c0f1 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@@ -73,7 +73,6 @@ import io.onedev.server.web.component.savedquery.SavedQueriesOpened;import io.onedev.server.web.component.stringchoice.StringMultiChoice;import io.onedev.server.web.component.user.ident.UserIdentPanel;import io.onedev.server.web.component.user.ident.UserIdentPanel.Mode;-import io.onedev.server.web.model.EntityModel;import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;import io.onedev.server.web.page.project.issues.create.NewIssuePage;import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;@@ -86,8 +85,6 @@ public abstract class IssueListPanel extends Panel {private static final Logger logger = LoggerFactory.getLogger(IssueListPanel.class);- private final IModel<Project> projectModel;-private final String query;private IModel<IssueQuery> parsedQueryModel = new LoadableDetachableModel<IssueQuery>() {@@ -119,9 +116,8 @@ public abstract class IssueListPanel extends Panel {private SortableDataProvider<Issue, Void> dataProvider;- public IssueListPanel(String id, @Nullable Project project, @Nullable String query) {+ public IssueListPanel(String id, @Nullable String query) {super(id);- projectModel = project!=null?new EntityModel<Project>(project):Model.of((Project)null);this.query = query;}@@ -132,14 +128,11 @@ public abstract class IssueListPanel extends Panel {@Overrideprotected void onDetach() {parsedQueryModel.detach();- projectModel.detach();super.onDetach();}@Nullable- private Project getProject() {- return projectModel.getObject();- }+ protected abstract Project getProject();protected IssueQuery getBaseQuery() {return new IssueQuery();diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/statetransition/StateTransitionListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/statetransition/StateTransitionListPanel.htmlindex 360926ea01..135280131c 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/statetransition/StateTransitionListPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/statetransition/StateTransitionListPanel.html@@ -1,7 +1,7 @@<wicket:panel><div class="state-transition-list def-list list"><div class="head">- <a wicket:id="addNew" class="btn btn-default"><i class="fa fa-plus"></i> Add New</a>+ <a wicket:id="addNew" class="btn btn-success"><i class="fa fa-plus"></i> Add New</a><a wicket:id="useDefault" class="btn btn-default"><i class="fa fa-undo"></i> Use Default</a></div><table wicket:id="stateTransitions" class="table table-hover"></table>diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/JobDefLink.java b/server-core/src/main/java/io/onedev/server/web/component/job/JobDefLink.javaindex 5a76b36e05..6e57b980f3 100644--- a/server-core/src/main/java/io/onedev/server/web/component/job/JobDefLink.java+++ b/server-core/src/main/java/io/onedev/server/web/component/job/JobDefLink.java@@ -1,8 +1,9 @@package io.onedev.server.web.component.job;+import javax.annotation.Nullable;+import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.html.link.BookmarkablePageLink;-import org.apache.wicket.model.IModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.eclipse.jgit.lib.FileMode;import org.eclipse.jgit.lib.ObjectId;@@ -12,22 +13,18 @@ import io.onedev.server.ci.job.Job;import io.onedev.server.git.BlobIdent;import io.onedev.server.model.Project;import io.onedev.server.util.SecurityUtils;-import io.onedev.server.web.model.EntityModel;import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.blob.render.renderers.cispec.CISpecRendererProvider;@SuppressWarnings("serial")-public class JobDefLink extends BookmarkablePageLink<Void> {+public abstract class JobDefLink extends BookmarkablePageLink<Void> {- private final IModel<Project> projectModel;-private final ObjectId commitId;private final String jobName;- public JobDefLink(String id, Project project, ObjectId commitId, String jobName) {+ public JobDefLink(String id, ObjectId commitId, String jobName) {super(id, ProjectBlobPage.class);- this.projectModel = new EntityModel<Project>(project);this.commitId = commitId;this.jobName = jobName;}@@ -35,7 +32,7 @@ public class JobDefLink extends BookmarkablePageLink<Void> {@Overrideprotected void onConfigure() {super.onConfigure();- setEnabled(SecurityUtils.canReadCode(projectModel.getObject()));+ setEnabled(SecurityUtils.canReadCode(getProject()));}@Override@@ -45,18 +42,19 @@ public class JobDefLink extends BookmarkablePageLink<Void> {tag.setName("span");}- @Override- protected void onDetach() {- projectModel.detach();- super.onDetach();- }-+ @Nullable+ protected abstract Project getProject();+@Overridepublic PageParameters getPageParameters() {- ProjectBlobPage.State state = new ProjectBlobPage.State();- state.blobIdent = new BlobIdent(commitId.name(), CISpec.BLOB_PATH, FileMode.REGULAR_FILE.getBits());- state.position = CISpecRendererProvider.getPosition(Job.SELECTION_PREFIX + jobName);- return ProjectBlobPage.paramsOf(projectModel.getObject(), state);+ if (getProject() != null) {+ ProjectBlobPage.State state = new ProjectBlobPage.State();+ state.blobIdent = new BlobIdent(commitId.name(), CISpec.BLOB_PATH, FileMode.REGULAR_FILE.getBits());+ state.position = CISpecRendererProvider.getPosition(Job.SELECTION_PREFIX + jobName);+ return ProjectBlobPage.paramsOf(getProject(), state);+ } else {+ return super.getPageParameters();+ }}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java b/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.javaindex b135bcbf2c..58bd13ede9 100644--- a/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java+++ b/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java@@ -8,7 +8,6 @@ import java.util.Map;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.model.IModel;import org.eclipse.jgit.lib.ObjectId;import com.google.common.base.Preconditions;@@ -27,30 +26,24 @@ import io.onedev.server.util.scriptidentity.JobIdentity;import io.onedev.server.util.scriptidentity.ScriptIdentity;import io.onedev.server.util.scriptidentity.ScriptIdentityAware;import io.onedev.server.web.component.beaneditmodal.BeanEditModalPanel;-import io.onedev.server.web.model.EntityModel;import io.onedev.server.web.page.project.builds.detail.dashboard.BuildDashboardPage;import io.onedev.server.web.page.project.builds.detail.log.BuildLogPage;@SuppressWarnings("serial")-public class RunJobLink extends AjaxLink<Void> {+public abstract class RunJobLink extends AjaxLink<Void> {- private final IModel<Project> projectModel;-private final ObjectId commitId;private final String jobName;- public RunJobLink(String componentId, Project project, ObjectId commitId, String jobName) {+ public RunJobLink(String componentId, ObjectId commitId, String jobName) {super(componentId);- this.projectModel = new EntityModel<Project>(project);this.commitId = commitId;this.jobName = jobName;}- private Project getProject() {- return projectModel.getObject();- }+ protected abstract Project getProject();@Overridepublic void onClick(AjaxRequestTarget target) {@@ -105,12 +98,6 @@ public class RunJobLink extends AjaxLink<Void> {setVisible(SecurityUtils.canRunJob(getProject(), jobName));}- @Override- protected void onDetach() {- projectModel.detach();- super.onDetach();- }-private abstract class ParamEditModalPanel extends BeanEditModalPanel implements InputContext, ScriptIdentityAware {public ParamEditModalPanel(AjaxRequestTarget target, Serializable bean) {diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.javaindex 90b5565c2b..294bbd42f4 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java@@ -54,19 +54,16 @@ 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 {+public abstract 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>() {@@ -90,10 +87,8 @@ public class PullRequestListPanel extends Panel {private DataTable<PullRequest, Void> requestsTable;- public PullRequestListPanel(String id, @Nullable Project project, @Nullable String query) {+ public PullRequestListPanel(String id, @Nullable String query) {super(id);-- projectModel = project!=null?new EntityModel<Project>(project):Model.of((Project)null);this.query = query;}@@ -117,14 +112,11 @@ public class PullRequestListPanel extends Panel {@Overrideprotected void onDetach() {parsedQueryModel.detach();- projectModel.detach();super.onDetach();}@Nullable- private Project getProject() {- return projectModel.getObject();- }+ protected abstract Project getProject();@Overrideprotected void onInitialize() {@@ -262,9 +254,13 @@ public class PullRequestListPanel extends Panel {@Overrideprotected 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());+ if (getProject() != null) {+ OddEvenItem<?> row = cellItem.findParent(OddEvenItem.class);+ return new QueryPosition(parsedQueryModel.getObject().toString(), (int)requestsTable.getItemCount(),+ (int)requestsTable.getCurrentPage() * WebConstants.PAGE_SIZE + row.getIndex());+ } else {+ return null;+ }}});diff --git a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/AffinalRevisionPicker.java b/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/AffinalRevisionPicker.javaindex e4a7095664..b68ffcf2b5 100644--- a/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/AffinalRevisionPicker.java+++ b/server-core/src/main/java/io/onedev/server/web/component/revisionpicker/AffinalRevisionPicker.java@@ -1,5 +1,9 @@package io.onedev.server.web.component.revisionpicker;+import java.util.Collection;+import java.util.Iterator;+import java.util.List;+import javax.annotation.Nullable;import org.apache.wicket.ajax.AjaxRequestTarget;@@ -11,8 +15,8 @@ import org.apache.wicket.model.LoadableDetachableModel;import io.onedev.server.OneDev;import io.onedev.server.model.Project;import io.onedev.server.persistence.dao.Dao;+import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.component.project.ProjectPicker;-import io.onedev.server.web.model.AffinalProjectsModel;@SuppressWarnings("serial")public abstract class AffinalRevisionPicker extends Panel {@@ -60,7 +64,20 @@ public abstract class AffinalRevisionPicker extends Panel {protected void onInitialize() {super.onInitialize();- add(new ProjectPicker("projectPicker", new AffinalProjectsModel(projectId), projectId) {+ add(new ProjectPicker("projectPicker", new LoadableDetachableModel<Collection<Project>>() {++ @Override+ protected Collection<Project> load() {+ Project project = OneDev.getInstance(Dao.class).load(Project.class, projectId);+ List<Project> affinals = project.getForkRoot().getForkDescendants();+ for (Iterator<Project> it = affinals.iterator(); it.hasNext();) {+ if (!SecurityUtils.canAccess(it.next()))+ it.remove();+ }+ return affinals;+ }++ }, projectId) {@Overrideprotected void onSelect(AjaxRequestTarget target, Project project) {diff --git a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.html b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.htmlindex 2a79e8eb4b..536dc2637b 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.html+++ b/server-core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.html@@ -1,6 +1,6 @@<wicket:panel><div class="bean-list list">- <div class="head"><a wicket:id="addElement" title="Add new" class="add-element btn btn-default btn-xs"><i class="fa fa-plus"></i></a></div>+ <div class="head"><a wicket:id="addElement" title="Add new" class="add-element btn btn-success btn-xs"><i class="fa fa-plus"></i></a></div><table class="table table-condensed"><thead><th class="actions minimum"></th>diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListEditPanel.htmlindex c401f32189..c530715d40 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListEditPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListEditPanel.html@@ -1,7 +1,7 @@<wicket:panel><div class="job-dependency-list list"><div class="head">- <a wicket:id="addNew" title="Add new" class="btn btn-default btn-xs"><i class="fa fa-plus"></i></a>+ <a wicket:id="addNew" title="Add new" class="btn btn-success btn-xs"><i class="fa fa-plus"></i></a></div><table wicket:id="dependencies" class="table table-condensed table-hover"></table></div>diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditPanel.htmlindex d86e9bf1a0..08676be386 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditPanel.html@@ -1,7 +1,7 @@<wicket:panel><div class="param-spec-list list"><div class="head">- <a wicket:id="addNew" title="Add new" class="btn btn-default btn-xs"><i class="fa fa-plus"></i></a>+ <a wicket:id="addNew" title="Add new" class="btn btn-success btn-xs"><i class="fa fa-plus"></i></a></div><table wicket:id="paramSpecs" class="table table-condensed table-hover"></table></div>diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionListEditPanel.htmlindex f6ae808ecc..31f9256657 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionListEditPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionListEditPanel.html@@ -1,7 +1,7 @@<wicket:panel><div class="action-list list"><div class="head">- <a wicket:id="addNew" title="Add new" class="btn btn-default btn-xs"><i class="fa fa-plus"></i></a>+ <a wicket:id="addNew" title="Add new" class="btn btn-success btn-xs"><i class="fa fa-plus"></i></a></div><table wicket:id="actions" class="table table-condensed table-hover"></table></div>diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/PrivilegeListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/PrivilegeListEditPanel.htmlindex 0f1421f2e6..dc3c527c4b 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/PrivilegeListEditPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/privilege/PrivilegeListEditPanel.html@@ -1,7 +1,7 @@<wicket:panel><div class="job-privilege-list list"><div class="head">- <a wicket:id="addNew" title="Add new" class="btn btn-default btn-xs"><i class="fa fa-plus"></i></a>+ <a wicket:id="addNew" title="Add new" class="btn btn-success btn-xs"><i class="fa fa-plus"></i></a></div><table wicket:id="privileges" class="table table-condensed table-hover"></table></div>diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListEditPanel.htmlindex c401f32189..c530715d40 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListEditPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListEditPanel.html@@ -1,7 +1,7 @@<wicket:panel><div class="job-dependency-list list"><div class="head">- <a wicket:id="addNew" title="Add new" class="btn btn-default btn-xs"><i class="fa fa-plus"></i></a>+ <a wicket:id="addNew" title="Add new" class="btn btn-success btn-xs"><i class="fa fa-plus"></i></a></div><table wicket:id="dependencies" class="table table-condensed table-hover"></table></div>diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportListEditPanel.htmlindex 49a65894c0..4009b2e76d 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportListEditPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportListEditPanel.html@@ -1,7 +1,7 @@<wicket:panel><div class="report-list list"><div class="head">- <a wicket:id="addNew" title="Add new" class="btn btn-default btn-xs"><i class="fa fa-plus"></i></a>+ <a wicket:id="addNew" title="Add new" class="btn btn-success btn-xs"><i class="fa fa-plus"></i></a></div><table wicket:id="reports" class="table table-condensed table-hover"></table></div>diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListEditPanel.htmlindex baa9142e80..22b81e9e6c 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListEditPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListEditPanel.html@@ -1,7 +1,7 @@<wicket:panel><div class="job-service-list list"><div class="head">- <a wicket:id="addNew" title="Add new" class="btn btn-default btn-xs"><i class="fa fa-plus"></i></a>+ <a wicket:id="addNew" title="Add new" class="btn btn-success btn-xs"><i class="fa fa-plus"></i></a></div><table wicket:id="services" class="table table-condensed table-hover"></table></div>diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListEditPanel.htmlindex fc300befa8..e30bfdddaa 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListEditPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListEditPanel.html@@ -1,7 +1,7 @@<wicket:panel><div class="trigger-list list"><div class="head">- <a wicket:id="addNew" title="Add new" class="btn btn-default btn-xs"><i class="fa fa-plus"></i></a>+ <a wicket:id="addNew" title="Add new" class="btn btn-success btn-xs"><i class="fa fa-plus"></i></a></div><table wicket:id="triggers" class="table table-condensed table-hover"></table></div>diff --git a/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorListEditPanel.htmlindex 55a271645f..6fb560ec85 100644--- a/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorListEditPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorListEditPanel.html@@ -1,7 +1,7 @@<wicket:panel><div class="locator-list list"><div class="head">- <a wicket:id="addNew" title="Add new" class="btn btn-default btn-xs"><i class="fa fa-plus"></i></a>+ <a wicket:id="addNew" title="Add new" class="btn btn-success btn-xs"><i class="fa fa-plus"></i></a></div><table wicket:id="locators" class="table table-condensed table-hover"></table></div>diff --git a/server-core/src/main/java/io/onedev/server/web/model/AffinalProjectsModel.java b/server-core/src/main/java/io/onedev/server/web/model/AffinalProjectsModel.javadeleted file mode 100644index 72b27539d2..0000000000--- a/server-core/src/main/java/io/onedev/server/web/model/AffinalProjectsModel.java+++ /dev/null@@ -1,34 +0,0 @@-package io.onedev.server.web.model;--import java.util.Collection;-import java.util.Iterator;-import java.util.List;--import org.apache.wicket.model.LoadableDetachableModel;--import io.onedev.server.OneDev;-import io.onedev.server.model.Project;-import io.onedev.server.persistence.dao.Dao;-import io.onedev.server.util.SecurityUtils;--@SuppressWarnings("serial")-public class AffinalProjectsModel extends LoadableDetachableModel<Collection<Project>> {-- private final Long projectId;-- public AffinalProjectsModel(Long projectId) {- this.projectId = projectId;- }-- @Override- protected Collection<Project> load() {- Project project = OneDev.getInstance(Dao.class).load(Project.class, projectId);- List<Project> affinals = project.getForkRoot().getForkDescendants();- for (Iterator<Project> it = affinals.iterator(); it.hasNext();) {- if (!SecurityUtils.canAccess(it.next()))- it.remove();- }- return affinals;- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/model/EntityModel.java b/server-core/src/main/java/io/onedev/server/web/model/EntityModel.javadeleted file mode 100644index a711c36338..0000000000--- a/server-core/src/main/java/io/onedev/server/web/model/EntityModel.java+++ /dev/null@@ -1,42 +0,0 @@-package io.onedev.server.web.model;--import org.apache.wicket.model.LoadableDetachableModel;-import org.hibernate.proxy.HibernateProxyHelper;--import io.onedev.commons.launcher.loader.AppLoader;-import io.onedev.server.model.AbstractEntity;-import io.onedev.server.persistence.dao.Dao;--public class EntityModel<T extends AbstractEntity> extends LoadableDetachableModel<T> {-- private static final long serialVersionUID = 1L;-- private final Class<T> entityClass;-- private final Long entityId;-- public EntityModel(Class<T> entityClass, Long entityId) {- this.entityClass = entityClass;- this.entityId = entityId;- }-- @SuppressWarnings("unchecked")- public EntityModel(T entity) {- this((Class<T>) HibernateProxyHelper.getClassWithoutInitializingProxy(entity), entity.getId());- setObject(entity);- }-- @Override- protected T load() {- return AppLoader.getInstance(Dao.class).load(entityClass, entityId);- }-- public Class<T> getEntityClass() {- return entityClass;- }-- public Long getEntityId() {- return entityId;- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.htmlindex 4995565900..98bbacf828 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/groovyscript/GroovyScriptListPage.html@@ -1,16 +1,16 @@<wicket:extend><div class="page-title">Groovy Scripts</div>+ <div class="help-block">All Groovy scripts used across the system+ should be defined here and reviewed by the site administrator for security reasons. For a given+ name, the first authorized script will be used</div><div class="groovy-scripts def-list list"><div class="head clearfix"><div class="pull-left">- <a wicket:id="addNew" class="btn btn-default"><i class="fa fa-plus"></i> Add New</a>+ <a wicket:id="addNew" class="btn btn-success"><i class="fa fa-plus"></i> Add New</a></div></div><div class="body"><table wicket:id="scripts" class="table table-hover"></table>- <div class="help-block"><i class="fa fa-info-circle"></i> All Groovy scripts used across the system- should be defined here and reviewed by the site administrator for security reasons. For a given- name, the first authorized script will be used</div></div></div><wicket:fragment wicket:id="columnFrag">diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.htmlindex 1cfdb61554..14b8cfc008 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupListPage.html@@ -6,7 +6,7 @@<input wicket:id="filterGroups" class="form-control search" placeholder="Filter by name"></div><div class="pull-left">- <a wicket:id="addNew" class="btn btn-default"><i class="fa fa-plus"></i> Add New Group</a>+ <a wicket:id="addNew" class="btn btn-success"><i class="fa fa-plus"></i> Add New Group</a></div></div><div class="body">diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupPage.javaindex 38d8e77142..aa24835ce3 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupPage.java@@ -10,9 +10,12 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import org.unbescape.html.HtmlEscape;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.GroupManager;import io.onedev.server.model.Group;import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.component.floating.AlignPlacement;@@ -22,7 +25,6 @@ import io.onedev.server.web.component.sidebar.SideBar;import io.onedev.server.web.component.tabbable.PageTab;import io.onedev.server.web.component.tabbable.Tab;import io.onedev.server.web.component.tabbable.Tabbable;-import io.onedev.server.web.model.EntityModel;import io.onedev.server.web.page.admin.AdministrationPage;@SuppressWarnings("serial")@@ -37,7 +39,14 @@ public abstract class GroupPage extends AdministrationPage {Long groupId = params.get(PARAM_GROUP).toLong();- groupModel = new EntityModel<Group>(Group.class, groupId);+ groupModel = new LoadableDetachableModel<Group>() {++ @Override+ protected Group load() {+ return OneDev.getInstance(GroupManager.class).load(groupId);+ }++ };}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultBoardListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultBoardListPage.htmlindex d737da3427..48e19656ef 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultBoardListPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultBoardListPage.html@@ -1,14 +1,14 @@<wicket:extend>+ <div class="help-block">Define default issue boards for all projects here.+ A certain project can override this setting to define its own issue boards.</div><div class="issue-boards def-list list"><div class="head clearfix"><div class="pull-left">- <a wicket:id="addNew" class="btn btn-default"><i class="fa fa-plus"></i> Add New</a>+ <a wicket:id="addNew" class="btn btn-success"><i class="fa fa-plus"></i> Add New</a></div></div><div class="body"><table wicket:id="issueBoards" class="table table-hover"></table>- <div class="help-block"><i class="fa fa-info-circle"></i> Define default issue boards for all projects here.- A certain project can override this setting to define its own issue boards.</div></div></div><wicket:fragment wicket:id="columnFrag">diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultStateTransitionsPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultStateTransitionsPage.htmlindex 99d9ea7baf..9a12deca06 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultStateTransitionsPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultStateTransitionsPage.html@@ -1,5 +1,5 @@<wicket:extend>- <div wicket:id="content"></div>- <div class="help-block"><i class="fa fa-info-circle"></i> Define default issue transitions for all projects here.+ <div class="help-block">Define default issue transitions for all projects here.A certain project can override this setting to define its own issue transitions.</div>+ <div wicket:id="content"></div></wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.htmlindex 3c551ec6fb..2d40938c63 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.html@@ -1,13 +1,13 @@<wicket:extend>+ <div class="help-block">Define all custom issue fields here. Each project can+ decide to use all or a subset of these fields via its issue transition setting</div><div class="issue-fields def-list list"><div class="head clearfix"><div class="pull-left">- <a wicket:id="addNew" class="btn btn-default"><i class="fa fa-plus"></i> Add New</a>+ <a wicket:id="addNew" class="btn btn-success"><i class="fa fa-plus"></i> Add New</a></div></div><table wicket:id="issueFields" class="table table-hover"></table>- <div class="help-block"><i class="fa fa-info-circle"></i> Define all custom issue fields here. Each project can- decide to use all or a subset of these fields via its issue transition setting</div></div><wicket:fragment wicket:id="columnFrag"><a wicket:id="link"><span wicket:id="label"></span></a>diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueStateListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueStateListPage.htmlindex 634b01d7b6..19a49ce61f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueStateListPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueStateListPage.html@@ -1,15 +1,15 @@<wicket:extend>+ <div class="help-block">Define all custom issue states here. Each project can+ decide to use all or a subset of these states via its issue transition setting.+ The first state will be used as initial state of created issues</div><div class="issue-states def-list list"><div class="head clearfix"><div class="pull-left">- <a wicket:id="addNew" class="btn btn-default"><i class="fa fa-plus"></i> Add New</a>+ <a wicket:id="addNew" class="btn btn-success"><i class="fa fa-plus"></i> Add New</a></div></div><div class="body">- <div class="alert alert-info">The first state will be used as initial state of created issues</div><table wicket:id="issueStates" class="table table-hover"></table>- <div class="help-block"><i class="fa fa-info-circle"></i> Define all custom issue states here. Each project can- decide to use all or a subset of these states via its issue transition setting</div></div></div><wicket:fragment wicket:id="columnFrag">diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPage.htmlindex a224c14960..50e61d2702 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPage.html@@ -1,13 +1,13 @@<wicket:extend><div class="page-title">Job Executors</div>+ <div class="help-block">+ For a given CI job, the first matching job executor will be used+ </div><div wicket:id="jobExecutorSetting" class="panel-list"><ul class="list-unstyled protections"><li wicket:id="executors" class="executor"><div wicket:id="executor"></div></li></ul><div wicket:id="newExecutor"></div>- <div class="help-block">- <i class="fa fa-info-circle"></i> For a given CI job, the first matching job executor will be used- </div></div><wicket:fragment wicket:id="editNewFrag"><div class="executor panel panel-default">diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.javaindex 184e863f45..929093cf3f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleDetailPage.java@@ -9,6 +9,7 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.commons.utils.HtmlUtils;@@ -21,7 +22,6 @@ import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.editable.Path;import io.onedev.server.web.editable.PathNode;-import io.onedev.server.web.model.EntityModel;import io.onedev.server.web.page.admin.AdministrationPage;import io.onedev.server.web.util.ConfirmOnClick;@@ -41,7 +41,14 @@ public class RoleDetailPage extends AdministrationPage {Long roleId = params.get(PARAM_ROLE).toLong();- roleModel = new EntityModel<Role>(Role.class, roleId);+ roleModel = new LoadableDetachableModel<Role>() {++ @Override+ protected Role load() {+ return OneDev.getInstance(RoleManager.class).load(roleId);+ }++ };}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.htmlindex 7fa7e8820c..f5c2eb43b3 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/role/RoleListPage.html@@ -6,7 +6,7 @@<input wicket:id="filterRoles" class="form-control search" placeholder="Filter by name"></div><div class="pull-left">- <a wicket:id="addNew" class="btn btn-default"><i class="fa fa-plus"></i> Add New Role</a>+ <a wicket:id="addNew" class="btn btn-success"><i class="fa fa-plus"></i> Add New Role</a></div></div><div class="body">diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.htmlindex 6e62e51027..d93d6f9d70 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserListPage.html@@ -6,7 +6,7 @@<input wicket:id="filterUsers" class="form-control search" placeholder="Filter by name"></div><div class="pull-left">- <a wicket:id="addNew" class="btn btn-default"><i class="fa fa-plus"></i> Add New User</a>+ <a wicket:id="addNew" class="btn btn-success"><i class="fa fa-plus"></i> Add New User</a></div></div><div class="body">diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.javaindex a3cdeb5d10..30fef7f8e4 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java@@ -10,8 +10,11 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.request.mapper.parameter.PageParameters;+import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.User;import io.onedev.server.util.userident.UserIdent;import io.onedev.server.web.component.floating.AlignPlacement;@@ -22,7 +25,6 @@ import io.onedev.server.web.component.tabbable.PageTab;import io.onedev.server.web.component.tabbable.Tab;import io.onedev.server.web.component.tabbable.Tabbable;import io.onedev.server.web.component.user.avatar.UserAvatar;-import io.onedev.server.web.model.EntityModel;import io.onedev.server.web.page.admin.AdministrationPage;@SuppressWarnings("serial")@@ -35,7 +37,15 @@ public abstract class UserPage extends AdministrationPage {public UserPage(PageParameters params) {super(params);- userModel = new EntityModel<User>(User.class, params.get(PARAM_USER).toLong());+ Long userId = params.get(PARAM_USER).toLong();+ userModel = new LoadableDetachableModel<User>() {++ @Override+ protected User load() {+ return OneDev.getInstance(UserManager.class).load(userId);+ }++ };}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/build/BuildListPage.html b/server-core/src/main/java/io/onedev/server/web/page/build/BuildListPage.htmlnew file mode 100644index 0000000000..1780822542--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/build/BuildListPage.html@@ -0,0 +1,7 @@+<wicket:extend>+ <div class="page-title">Builds</div>+ <div id="build-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/build/BuildListPage.java b/server-core/src/main/java/io/onedev/server/web/page/build/BuildListPage.javanew file mode 100644index 0000000000..d44c7a5a65--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/build/BuildListPage.java@@ -0,0 +1,233 @@+package io.onedev.server.web.page.build;++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.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.Project;+import io.onedev.server.model.support.NamedBuildQuery;+import io.onedev.server.model.support.NamedQuery;+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;+import io.onedev.server.web.component.modal.ModalPanel;+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.NamedBuildQueriesBean;+import io.onedev.server.web.util.PagingHistorySupport;+import io.onedev.server.web.util.QuerySaveSupport;++@SuppressWarnings("serial")+public class BuildListPage extends LayoutPage {++ private static final String PARAM_CURRENT_PAGE = "currentPage";++ private static final String PARAM_QUERY = "query";++ private String query;++ public BuildListPage(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 (NamedBuildQuery namedQuery: getLoginUser().getBuildQuerySetting().getUserQueries())+ queries.add(namedQuery.getQuery());+ }+ for (NamedBuildQuery namedQuery: getBuildSetting().getNamedQueries())+ queries.add(namedQuery.getQuery());+ for (String each: queries) {+ try {+ if (SecurityUtils.getUser() != null || !BuildQuery.parse(null, each).needsLogin()) {+ query = each;+ break;+ }+ } catch (Exception e) {+ }+ }+ }+ }++ protected BuildSetting getBuildSetting() {+ return OneDev.getInstance(SettingManager.class).getBuildSetting();+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ SavedQueriesPanel<NamedBuildQuery> savedQueries;+ add(savedQueries = new SavedQueriesPanel<NamedBuildQuery>("side") {++ @Override+ protected NamedQueriesBean<NamedBuildQuery> newNamedQueriesBean() {+ return new NamedBuildQueriesBean();+ }++ @Override+ protected boolean needsLogin(NamedBuildQuery namedQuery) {+ return BuildQuery.parse(null, namedQuery.getQuery()).needsLogin();+ }++ @Override+ protected Link<Void> newQueryLink(String componentId, NamedBuildQuery namedQuery) {+ return new BookmarkablePageLink<Void>(componentId, BuildListPage.class,+ BuildListPage.paramsOf(namedQuery.getQuery(), 0));+ }++ @Override+ protected QuerySetting<NamedBuildQuery> getQuerySetting() {+ if (getLoginUser() != null)+ return getLoginUser().getBuildQuerySetting();+ else+ return null;+ }++ @Override+ protected ArrayList<NamedBuildQuery> getQueries() {+ return (ArrayList<NamedBuildQuery>) getBuildSetting().getNamedQueries();+ }++ @Override+ protected void onSaveQuerySetting(QuerySetting<NamedBuildQuery> querySetting) {+ OneDev.getInstance(UserManager.class).save(getLoginUser());+ }++ @Override+ protected void onSaveQueries(ArrayList<NamedBuildQuery> namedQueries) {+ getBuildSetting().setNamedQueries(namedQueries);+ OneDev.getInstance(SettingManager.class).saveBuildSetting(getBuildSetting());+ }++ @Override+ protected ArrayList<NamedBuildQuery> getDefaultQueries() {+ return (ArrayList<NamedBuildQuery>) getBuildSetting().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 BuildListPanel("main", query) {++ @Override+ protected PagingHistorySupport getPagingHistorySupport() {+ return pagingHistorySupport;+ }++ @Override+ protected void onQueryUpdated(AjaxRequestTarget target, String query) {+ setResponsePage(BuildListPage.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) {+ QuerySetting<NamedBuildQuery> querySetting = getLoginUser().getBuildQuerySetting();+ NamedBuildQuery namedQuery = NamedQuery.find(querySetting.getUserQueries(), name);+ if (namedQuery == null) {+ namedQuery = new NamedBuildQuery(name, query);+ querySetting.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) {+ BuildSetting buildSetting = getBuildSetting();+ NamedBuildQuery namedQuery = buildSetting.getNamedQuery(name);+ if (namedQuery == null) {+ namedQuery = new NamedBuildQuery(name, query);+ buildSetting.getNamedQueries().add(namedQuery);+ } else {+ namedQuery.setQuery(query);+ }+ OneDev.getInstance(SettingManager.class).saveBuildSetting(buildSetting);+ target.add(savedQueries);+ close();+ }++ @Override+ protected void onCancel(AjaxRequestTarget target) {+ close();+ }++ };+ }++ };+ }++ @Override+ public boolean isSavedQueriesVisible() {+ savedQueries.configure();+ return savedQueries.isVisible();+ }++ };+ }++ @Override+ protected Project getProject() {+ return null;+ }++ });++ }++ 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/issue/IssueListPage.java b/server-core/src/main/java/io/onedev/server/web/page/issue/IssueListPage.javaindex d6ee4172df..09a5a2a481 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,6 +16,7 @@ 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.Project;import io.onedev.server.model.support.NamedQuery;import io.onedev.server.model.support.QuerySetting;import io.onedev.server.model.support.administration.IssueSetting;@@ -112,7 +113,6 @@ public class IssueListPage extends LayoutPage {@Overrideprotected void onSaveQuerySetting(QuerySetting<NamedIssueQuery> querySetting) {- getLoginUser().setIssueQuerySetting(querySetting);OneDev.getInstance(UserManager.class).save(getLoginUser());}@@ -145,7 +145,7 @@ public class IssueListPage extends LayoutPage {};- add(new IssueListPanel("main", null, query) {+ add(new IssueListPanel("main", query) {@Overrideprotected PagingHistorySupport getPagingHistorySupport() {@@ -171,10 +171,11 @@ public class IssueListPage extends LayoutPage {@Overrideprotected void onSaveForMine(AjaxRequestTarget target, String name) {- NamedIssueQuery namedQuery = NamedQuery.find(getLoginUser().getIssueQuerySetting().getUserQueries(), name);+ QuerySetting<NamedIssueQuery> querySetting = getLoginUser().getIssueQuerySetting();+ NamedIssueQuery namedQuery = NamedQuery.find(querySetting.getUserQueries(), name);if (namedQuery == null) {namedQuery = new NamedIssueQuery(name, query);- getLoginUser().getIssueQuerySetting().getUserQueries().add(namedQuery);+ querySetting.getUserQueries().add(namedQuery);} else {namedQuery.setQuery(query);}@@ -218,6 +219,11 @@ public class IssueListPage extends LayoutPage {};}+ @Override+ protected Project getProject() {+ return null;+ }+});}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 ecfb217b4c..5c3de3dbfe 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@@ -20,6 +20,7 @@<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="navBuilds"><a wicket:id="link">Builds</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 68119ae3e9..f295294bed 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@@ -48,6 +48,7 @@ import io.onedev.server.web.page.admin.user.NewUserPage;import io.onedev.server.web.page.admin.user.UserListPage;import io.onedev.server.web.page.admin.user.UserPage;import io.onedev.server.web.page.base.BasePage;+import io.onedev.server.web.page.build.BuildListPage;import io.onedev.server.web.page.issue.IssueListPage;import io.onedev.server.web.page.my.MyAvatarPage;import io.onedev.server.web.page.my.MyPage;@@ -96,6 +97,13 @@ public abstract class LayoutPage extends BasePage {pullRequestsContainer.add(AttributeAppender.append("class", "active"));add(pullRequestsContainer);+ WebMarkupContainer buildsContainer = new WebMarkupContainer("navBuilds");+ buildsContainer.add(new ViewStateAwarePageLink<Void>("link", BuildListPage.class,+ BuildListPage.paramsOf("", 0)));+ if (getPage() instanceof BuildListPage)+ buildsContainer.add(AttributeAppender.append("class", "active"));+ add(buildsContainer);+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/blob/ProjectBlobPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.javaindex b011cc0d6e..caf42b7b82 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java@@ -683,10 +683,18 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, Sprivate void newCommitStatus(@Nullable AjaxRequestTarget target) {Component commitStatus;- if (resolvedRevision != null)- commitStatus = new CommitStatusPanel("buildStatus", getProject(), resolvedRevision);- else+ if (resolvedRevision != null) {+ commitStatus = new CommitStatusPanel("buildStatus", resolvedRevision) {++ @Override+ protected Project getProject() {+ return ProjectBlobPage.this.getProject();+ }++ };+ } else {commitStatus = new WebMarkupContainer("buildStatus");+ }commitStatus.setOutputMarkupPlaceholderTag(true);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.javaindex c6327efe39..a77acf081b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.java@@ -19,6 +19,7 @@ import com.google.common.base.Throwables;import io.onedev.server.ci.CISpec;import io.onedev.server.ci.job.Job;import io.onedev.server.git.Blob;+import io.onedev.server.model.Project;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.component.MultilineLabel;import io.onedev.server.web.component.job.RunJobLink;@@ -53,7 +54,14 @@ public class CISpecBlobViewPanel extends BlobViewPanel {WebMarkupContainer nav = new WebMarkupContainer(navsView.newChildId());nav.add(new Label("jobName", job.getName()));nav.add(AttributeAppender.append("data-name", job.getName()));- nav.add(new RunJobLink("run", context.getProject(), context.getCommit().copy(), job.getName()));+ nav.add(new RunJobLink("run", context.getCommit().copy(), job.getName()) {++ @Override+ protected Project getProject() {+ return context.getProject();+ }++ });navsView.add(nav);jobsView.add(BeanContext.view(jobsView.newChildId(), job));}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.javaindex 5b4d4f975c..9289d2315d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java@@ -463,7 +463,14 @@ public class ProjectBranchesPage extends ProjectPage {link.add(new Label("name", branch));item.add(link);- item.add(new CommitStatusPanel("buildStatus", getProject(), ref.getRef().getObjectId()));+ item.add(new CommitStatusPanel("buildStatus", ref.getRef().getObjectId()) {++ @Override+ protected Project getProject() {+ return ProjectBranchesPage.this.getProject();+ }++ });item.add(new AjaxLink<Void>("makeDefault") {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 feaad7bbeb..ee7ec52a80 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@@ -30,6 +30,7 @@ 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.project.ProjectPage;+import io.onedev.server.web.util.NamedBuildQueriesBean;import io.onedev.server.web.util.PagingHistorySupport;import io.onedev.server.web.util.QuerySaveSupport;@@ -141,7 +142,7 @@ public class ProjectBuildsPage extends ProjectPage {};- add(new BuildListPanel("main", getProject(), query) {+ add(new BuildListPanel("main", query) {@Overrideprotected PagingHistorySupport getPagingHistorySupport() {@@ -217,6 +218,11 @@ public class ProjectBuildsPage extends ProjectPage {};}+ @Override+ protected Project getProject() {+ return ProjectBuildsPage.this.getProject();+ }+});}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.javaindex f6e585ea9c..6e35155be8 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java@@ -45,6 +45,7 @@ import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.git.GitUtils;import io.onedev.server.model.Build;import io.onedev.server.model.Build.Status;+import io.onedev.server.model.Project;import io.onedev.server.model.support.inputspec.InputContext;import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.scriptidentity.JobIdentity;@@ -356,7 +357,7 @@ public abstract class BuildDetailPage extends ProjectPage implements InputContexcommitState.revision = getBuild().getCommitHash();PageParameters params = CommitDetailPage.paramsOf(projectModel.getObject(), commitState);- add(new CommitMessagePanel("commitMessage", getProject(), new AbstractReadOnlyModel<RevCommit>() {+ add(new CommitMessagePanel("commitMessage", new AbstractReadOnlyModel<RevCommit>() {@Overridepublic RevCommit getObject() {@@ -370,6 +371,11 @@ public abstract class BuildDetailPage extends ProjectPage implements InputContexsuper.onConfigure();setVisible(SecurityUtils.canReadCode(getProject()));}++ @Override+ protected Project getProject() {+ return BuildDetailPage.this.getProject();+ }});diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/changes/BuildChangesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/changes/BuildChangesPage.javaindex b4bf49ef1b..8380fde45b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/changes/BuildChangesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/changes/BuildChangesPage.java@@ -13,6 +13,7 @@ import com.google.common.collect.Lists;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.model.Build;+import io.onedev.server.model.Project;import io.onedev.server.search.commit.CommitQuery;import io.onedev.server.search.commit.Revision;import io.onedev.server.search.commit.RevisionCriteria;@@ -38,7 +39,7 @@ public class BuildChangesPage extends BuildDetailPage {BuildManager buildManager = OneDev.getInstance(BuildManager.class);Build prevBuild = buildManager.findStreamPrevious(getBuild(), null);- add(new CommitListPanel("commits", getProject(), query) {+ add(new CommitListPanel("commits", query) {@Overrideprotected void onQueryUpdated(AjaxRequestTarget target, String query) {@@ -54,6 +55,11 @@ public class BuildChangesPage extends BuildDetailPage {revisions.add(new Revision(getBuild().getCommitHash(), Revision.Scope.UNTIL));return new CommitQuery(Lists.newArrayList(new RevisionCriteria(revisions)));}++ @Override+ protected Project getProject() {+ return BuildChangesPage.this.getProject();+ }});}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/issues/FixedIssuesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/issues/FixedIssuesPage.javaindex a3a5a328f5..131f5c60b3 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/issues/FixedIssuesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/issues/FixedIssuesPage.java@@ -8,6 +8,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.model.Build;+import io.onedev.server.model.Project;import io.onedev.server.search.entity.issue.FixedInCriteria;import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.web.component.issue.list.IssueListPanel;@@ -33,7 +34,7 @@ public class FixedIssuesPage extends BuildDetailPage {protected void onInitialize() {super.onInitialize();- add(new IssueListPanel("issues", getProject(), query) {+ add(new IssueListPanel("issues", query) {@Overrideprotected IssueQuery getBaseQuery() {@@ -63,6 +64,11 @@ public class FixedIssuesPage extends BuildDetailPage {protected void onQueryUpdated(AjaxRequestTarget target, String query) {setResponsePage(FixedIssuesPage.class, FixedIssuesPage.paramsOf(getBuild(), getPosition(), query));}++ @Override+ protected Project getProject() {+ return FixedIssuesPage.this.getProject();+ }});}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.javaindex 953e904a35..3ef97f0b3b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java@@ -359,7 +359,14 @@ public class CommitDetailPage extends ProjectPage implements CommentSupport {detailLink.setOutputMarkupId(true);item.add(detailLink);- item.add(new RunJobLink("run", getProject(), commitId, job.getName()));+ item.add(new RunJobLink("run", commitId, job.getName()) {++ @Override+ protected Project getProject() {+ return CommitDetailPage.this.getProject();+ }++ });}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.javaindex 3ff1e19d69..c65266df88 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java@@ -118,7 +118,7 @@ public class ProjectCommitsPage extends ProjectPage {});- add(new CommitListPanel("main", getProject(), query) {+ add(new CommitListPanel("main", query) {@Overrideprotected void onQueryUpdated(AjaxRequestTarget target, String query) {@@ -191,6 +191,11 @@ public class ProjectCommitsPage extends ProjectPage {return compareWith;}+ @Override+ protected Project getProject() {+ return ProjectCommitsPage.this.getProject();+ }+});}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.javaindex 55be57df7a..60e8102475 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java@@ -601,7 +601,7 @@ public class RevisionComparePage extends ProjectPage implements CommentSupport {state.rightSide.getRevision(), pathFilterModel, whitespaceOptionModel, blameModel, this);break;default:- tabPanel = new CommitListPanel(TAB_PANEL_ID, getProject(), null) {+ tabPanel = new CommitListPanel(TAB_PANEL_ID, null) {@Overrideprotected CommitQuery getBaseQuery() {@@ -618,6 +618,11 @@ public class RevisionComparePage extends ProjectPage implements CommentSupport {}return new CommitQuery(Lists.newArrayList(new RevisionCriteria(revisions)));}++ @Override+ protected Project getProject() {+ return RevisionComparePage.this.getProject();+ }};diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.javaindex 7b65840627..531300e126 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java@@ -137,13 +137,18 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputConte@Overrideprotected void onSelect(AjaxRequestTarget target, Component tabLink) {- Component content = new BuildListPanel(TAB_CONTENT_ID, getIssue().getProject(), null) {+ Component content = new BuildListPanel(TAB_CONTENT_ID, null) {@Overrideprotected BuildQuery getBaseQuery() {return new BuildQuery(new FixedIssueCriteria(getIssue()), new ArrayList<>());}+ @Override+ protected Project getProject() {+ return getIssue().getProject();+ }+}.setOutputMarkupId(true);CardDetailPanel.this.replace(content);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/FixingBuildsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/FixingBuildsPage.javaindex e30ae01644..d41fceff0f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/FixingBuildsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/FixingBuildsPage.java@@ -8,6 +8,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.model.Issue;+import io.onedev.server.model.Project;import io.onedev.server.search.entity.build.BuildQuery;import io.onedev.server.search.entity.build.FixedIssueCriteria;import io.onedev.server.web.component.build.list.BuildListPanel;@@ -32,7 +33,7 @@ public class FixingBuildsPage extends IssueDetailPage {protected void onInitialize() {super.onInitialize();- add(new BuildListPanel("builds", getIssue().getProject(), query) {+ add(new BuildListPanel("builds", query) {@Overrideprotected BuildQuery getBaseQuery() {@@ -63,6 +64,11 @@ public class FixingBuildsPage extends IssueDetailPage {setResponsePage(FixingBuildsPage.class, FixingBuildsPage.paramsOf(getIssue(), getPosition(), query));}+ @Override+ protected Project getProject() {+ return getIssue().getProject();+ }+});}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 84cef81cf2..f1c6457dba 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@@ -137,7 +137,7 @@ public class ProjectIssueListPage extends ProjectIssuesPage {};- add(new IssueListPanel("main", getProject(), query) {+ add(new IssueListPanel("main", query) {@Overrideprotected PagingHistorySupport getPagingHistorySupport() {@@ -213,6 +213,11 @@ public class ProjectIssueListPage extends ProjectIssuesPage {};}+ @Override+ protected Project getProject() {+ return ProjectIssueListPage.this.getProject();+ }+});}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.javaindex 68bc8e789e..66a21c68de 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java@@ -15,6 +15,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.MilestoneManager;import io.onedev.server.model.Milestone;+import io.onedev.server.model.Project;import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.search.entity.issue.MilestoneCriteria;import io.onedev.server.util.SecurityUtils;@@ -116,7 +117,7 @@ public class MilestoneDetailPage extends ProjectIssuesPage {};- add(new IssueListPanel("issues", getProject(), query) {+ add(new IssueListPanel("issues", query) {@Overrideprotected IssueQuery getBaseQuery() {@@ -133,6 +134,11 @@ public class MilestoneDetailPage extends ProjectIssuesPage {setResponsePage(MilestoneDetailPage.class, MilestoneDetailPage.paramsOf(getMilestone(), query));}+ @Override+ protected Project getProject() {+ return MilestoneDetailPage.this.getProject();+ }+});}diff --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 1b7e87a311..2ec2880012 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@@ -144,7 +144,7 @@ public class ProjectPullRequestsPage extends ProjectPage {};- add(new PullRequestListPanel("main", getProject(), query) {+ add(new PullRequestListPanel("main", query) {@Overrideprotected PagingHistorySupport getPagingHistorySupport() {@@ -219,6 +219,11 @@ public class ProjectPullRequestsPage extends ProjectPage {};}++ @Override+ protected Project getProject() {+ return ProjectPullRequestsPage.this.getProject();+ }});diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.javaindex 77c9eb5e01..047bb59404 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java@@ -383,7 +383,7 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {}private Component newCommitsPanel() {- return new CommitListPanel(TAB_PANEL_ID, getProject(), null) {+ return new CommitListPanel(TAB_PANEL_ID, null) {@Overrideprotected void onConfigure() {@@ -400,6 +400,11 @@ public class NewPullRequestPage extends ProjectPage implements CommentSupport {return new CommitQuery(Lists.newArrayList(new RevisionCriteria(revisions)));}+ @Override+ protected Project getProject() {+ return NewPullRequestPage.this.getProject();+ }+}.setOutputMarkupId(true);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/CheckoutRequestInstructionPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/CheckoutRequestInstructionPanel.javaindex a25d83cfcb..f30d358dd8 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/CheckoutRequestInstructionPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/CheckoutRequestInstructionPanel.java@@ -2,22 +2,23 @@ package io.onedev.server.web.page.project.pullrequests.detail;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.model.IModel;import io.onedev.server.model.PullRequest;@SuppressWarnings("serial")-class CheckoutRequestInstructionPanel extends Panel {+abstract class CheckoutRequestInstructionPanel extends Panel {- public CheckoutRequestInstructionPanel(String id, IModel<PullRequest> model) {- super(id, model);+ public CheckoutRequestInstructionPanel(String id) {+ super(id);}+ protected abstract PullRequest getPullRequest();+@Overrideprotected void onInitialize() {super.onInitialize();- PullRequest request = (PullRequest) getDefaultModelObject();+ PullRequest request = getPullRequest();add(new Label("targetProjectName", request.getTargetProject().getName()));add(new Label("localBranch", "pull" + request.getNumber()));diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/ConflictResolveInstructionPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/ConflictResolveInstructionPanel.javaindex eed8d620f5..76b22d263f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/ConflictResolveInstructionPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/ConflictResolveInstructionPanel.java@@ -7,23 +7,24 @@ import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.html.panel.Panel;-import org.apache.wicket.model.IModel;import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.pullrequest.MergeStrategy;@SuppressWarnings("serial")-class ConflictResolveInstructionPanel extends Panel {+abstract class ConflictResolveInstructionPanel extends Panel {- public ConflictResolveInstructionPanel(String id, IModel<PullRequest> model) {- super(id, model);+ public ConflictResolveInstructionPanel(String id) {+ super(id);}+ protected abstract PullRequest getPullRequest();+@Overrideprotected void onInitialize() {super.onInitialize();- PullRequest request = (PullRequest) getDefaultModelObject();+ PullRequest request = getPullRequest();Fragment fragment;MergeStrategy strategy = request.getMergeStrategy();boolean sameRepo = request.getTarget().getProject().equals(request.getSource().getProject());diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.javaindex dd2cdd69a8..b7032e0219 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java@@ -123,7 +123,6 @@ import io.onedev.server.web.component.tabbable.Tab;import io.onedev.server.web.component.tabbable.Tabbable;import io.onedev.server.web.component.user.ident.UserIdentPanel;import io.onedev.server.web.component.user.ident.UserIdentPanel.Mode;-import io.onedev.server.web.model.EntityModel;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.builds.ProjectBuildsPage;import io.onedev.server.web.page.project.pullrequests.InvalidPullRequestPage;@@ -862,7 +861,14 @@ public abstract class PullRequestDetailPage extends ProjectPage {@Overrideprotected Component newContent(String id, FloatingPanel dropdown) {- return new ConflictResolveInstructionPanel(id, new EntityModel<PullRequest>(getPullRequest()));+ return new ConflictResolveInstructionPanel(id) {++ @Override+ protected PullRequest getPullRequest() {+ return PullRequestDetailPage.this.getPullRequest();+ }++ };}});@@ -886,7 +892,14 @@ public abstract class PullRequestDetailPage extends ProjectPage {@Overrideprotected Component newContent(String id, FloatingPanel dropdown) {- return new CheckoutRequestInstructionPanel(id, new EntityModel<PullRequest>(getPullRequest()));+ return new CheckoutRequestInstructionPanel(id) {++ @Override+ protected PullRequest getPullRequest() {+ return PullRequestDetailPage.this.getPullRequest();+ }++ };}});diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.javaindex 1bb5bd057e..c422b855ff 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java@@ -73,18 +73,30 @@ class PullRequestUpdatedPanel extends GenericPanel<PullRequestUpdate> {item.add(new UserIdentPanel("author", UserIdent.of(commit.getAuthorIdent()), Mode.AVATAR));- Project project = getUpdate().getRequest().getTarget().getProject();- item.add(new CommitMessagePanel("message", project, item.getModel()));+ item.add(new CommitMessagePanel("message", item.getModel()) {++ @Override+ protected Project getProject() {+ return getUpdate().getRequest().getTarget().getProject();+ }++ });- item.add(new CommitStatusPanel("buildStatus", project, commit.copy()) {+ item.add(new CommitStatusPanel("buildStatus", commit.copy()) {@Overrideprotected String getCssClasses() {return "btn btn-default btn-xs";}++ @Override+ protected Project getProject() {+ return getUpdate().getRequest().getTarget().getProject();+ }});+ Project project = getUpdate().getRequest().getTarget().getProject();CommitDetailPage.State commitState = new CommitDetailPage.State();commitState.revision = commit.name();PageParameters params = CommitDetailPage.paramsOf(project, commitState);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.javaindex 975909bf50..b03d14a9c7 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/mergepreview/MergePreviewPage.java@@ -24,6 +24,7 @@ import org.eclipse.jgit.lib.ObjectId;import io.onedev.server.OneDev;import io.onedev.server.git.GitUtils;+import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.pullrequest.MergePreview;import io.onedev.server.search.code.CommitIndexed;@@ -112,12 +113,17 @@ public class MergePreviewPage extends PullRequestDetailPage {fragment.add(hashLink);hashLink.add(new Label("hash", GitUtils.abbreviateSHA(preview.getMerged())));fragment.add(new WebMarkupContainer("copyMergedCommit").add(new CopyClipboardBehavior(Model.of(preview.getMerged()))));- fragment.add(new CommitStatusPanel("buildStatus", getProject(), ObjectId.fromString(preview.getMerged())) {+ fragment.add(new CommitStatusPanel("buildStatus", ObjectId.fromString(preview.getMerged())) {@Overrideprotected String getCssClasses() {return "btn btn-default";}++ @Override+ protected Project getProject() {+ return MergePreviewPage.this.getProject();+ }});fragment.add(new WebMarkupContainer("outDated") {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.javaindex 399ce0e471..14f2adba29 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java@@ -315,7 +315,14 @@ public class ProjectTagsPage extends ProjectPage {link.add(new Label("name", tagName));item.add(link);- item.add(new CommitStatusPanel("buildStatus", getProject(), ref.getPeeledObj().copy()));+ item.add(new CommitStatusPanel("buildStatus", ref.getPeeledObj().copy()) {++ @Override+ protected Project getProject() {+ return ProjectTagsPage.this.getProject();+ }++ });if (ref.getObj() instanceof RevTag) {RevTag revTag = (RevTag) ref.getObj();diff --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.javaindex 98628dbb5d..25cddc3a50 100644--- 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.java@@ -16,6 +16,7 @@ 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.Project;import io.onedev.server.model.support.NamedQuery;import io.onedev.server.model.support.QuerySetting;import io.onedev.server.model.support.administration.PullRequestSetting;@@ -103,7 +104,6 @@ public class PullRequestListPage extends LayoutPage {@Overrideprotected void onSaveQuerySetting(QuerySetting<NamedPullRequestQuery> querySetting) {- getLoginUser().setPullRequestQuerySetting(querySetting);OneDev.getInstance(UserManager.class).save(getLoginUser());}@@ -136,7 +136,7 @@ public class PullRequestListPage extends LayoutPage {};- add(new PullRequestListPanel("main", null, query) {+ add(new PullRequestListPanel("main", query) {@Overrideprotected PagingHistorySupport getPagingHistorySupport() {@@ -162,10 +162,11 @@ public class PullRequestListPage extends LayoutPage {@Overrideprotected void onSaveForMine(AjaxRequestTarget target, String name) {- NamedPullRequestQuery namedQuery = NamedQuery.find(getLoginUser().getPullRequestQuerySetting().getUserQueries(), name);+ QuerySetting<NamedPullRequestQuery> querySetting = getLoginUser().getPullRequestQuerySetting();+ NamedPullRequestQuery namedQuery = NamedQuery.find(querySetting.getUserQueries(), name);if (namedQuery == null) {namedQuery = new NamedPullRequestQuery(name, query);- getLoginUser().getPullRequestQuerySetting().getUserQueries().add(namedQuery);+ querySetting.getUserQueries().add(namedQuery);} else {namedQuery.setQuery(query);}@@ -208,6 +209,11 @@ public class PullRequestListPage extends LayoutPage {};}++ @Override+ protected Project getProject() {+ return null;+ }});diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/NamedBuildQueriesBean.java b/server-core/src/main/java/io/onedev/server/web/util/NamedBuildQueriesBean.javasimilarity index 93%rename from server-core/src/main/java/io/onedev/server/web/page/project/builds/NamedBuildQueriesBean.javarename to server-core/src/main/java/io/onedev/server/web/util/NamedBuildQueriesBean.javaindex 8d311b3acb..1917df670b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/NamedBuildQueriesBean.java+++ b/server-core/src/main/java/io/onedev/server/web/util/NamedBuildQueriesBean.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.builds;+package io.onedev.server.web.util;import java.util.ArrayList;import java.util.List;