Skip to content

The Unified and Autonomous Development Platform

Bug fixes

Robin Shen2590d954e143
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
index 48d8092f62..53c947b250 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
@@ -76,7 +76,7 @@ import io.onedev.server.web.util.ProjectAware;
@SuppressWarnings("serial")
public abstract class ProjectPage extends LayoutPage implements ProjectAware {
- private static final String PARAM_PROJECT = "project";
+ protected static final String PARAM_PROJECT = "project";
protected final IModel<Project> projectModel;
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.java
index 5800fcc9d1..b69ee819e2 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
@@ -460,9 +460,7 @@ public abstract class BuildDetailPage extends ProjectPage
@Override
public void navTo(AjaxRequestTarget target, Build entity, Cursor cursor) {
WebSession.get().setBuildCursor(cursor);
- PageParameters params = getPageParameters();
- params.set(PARAM_BUILD, entity.getNumber());
- setResponsePage(getPageClass(), params);
+ setResponsePage(getPageClass(), paramsOf(entity));
}
};
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.java
index 4eb78f607a..c3303135bf 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
@@ -22,6 +22,7 @@ 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;
+import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.component.commit.list.CommitListPanel;
import io.onedev.server.web.page.project.builds.detail.BuildDetailPage;
@@ -102,6 +103,11 @@ public class BuildChangesPage extends BuildDetailPage {
});
}
+ @Override
+ protected boolean isPermitted() {
+ return SecurityUtils.canReadCode(getProject());
+ }
+
@Override
protected void onPopState(AjaxRequestTarget target, Serializable data) {
query = (String) data;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java
index 8f83d5aadd..9ecdc092de 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java
@@ -408,7 +408,7 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Com
}
for (PullRequestChange change: request.getChanges()) {
- if (change.getUser().equals(user)
+ if (user.equals(change.getUser())
&& (lastReviewDate == null || lastReviewDate.before(change.getDate()))
&& (change.getData() instanceof PullRequestApproveData
|| change.getData() instanceof PullRequestReopenData
@@ -418,12 +418,12 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Com
}
for (CodeComment comment: request.getCodeComments()) {
- if (comment.getUser().equals(user) &&
+ if (user.equals(comment.getUser()) &&
(lastReviewDate == null || lastReviewDate.before(comment.getCreateDate()))) {
lastReviewDate = comment.getCreateDate();
}
for (CodeCommentReply reply: comment.getReplies()) {
- if (reply.getUser().equals(user) &&
+ if (user.equals(reply.getUser()) &&
(lastReviewDate == null || lastReviewDate.before(reply.getDate()))) {
lastReviewDate = reply.getDate();
}