Skip to content

The Unified and Autonomous Development Platform

Fix issue #693 - 500 error when creating pull request

Robin Shen6043eaf073d4
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
index 85577d3673..c3e6945c53 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
@@ -661,6 +661,8 @@ public class NewPullRequestPage extends ProjectPage implements RevisionDiff.Anno
getPullRequest().setTarget(target);
for (PullRequestReview review: getPullRequest().getReviews())
review.setUser(dao.load(User.class, review.getUser().getId()));
+ for (PullRequestAssignment assignment: getPullRequest().getAssignments())
+ assignment.setUser(dao.load(User.class, assignment.getUser().getId()));
OneDev.getInstance(PullRequestManager.class).open(getPullRequest());
diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/error/GeneralErrorPage.java b/server-core/src/main/java/io/onedev/server/web/page/simple/error/GeneralErrorPage.java
index 95104888c3..965ec80b29 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/simple/error/GeneralErrorPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/error/GeneralErrorPage.java
@@ -10,6 +10,8 @@ import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.request.http.WebResponse;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.base.Throwables;
@@ -24,6 +26,8 @@ import io.onedev.server.web.page.simple.SimplePage;
public class GeneralErrorPage extends SimplePage {
private static final int MAX_TITLE_LEN = 240;
+
+ private static final Logger logger = LoggerFactory.getLogger(GeneralErrorPage.class);
private String title;
@@ -42,6 +46,8 @@ public class GeneralErrorPage extends SimplePage {
title = "An unexpected exception occurred";
detailMessage = Throwables.getStackTraceAsString(exception);
statusCode = Response.Status.INTERNAL_SERVER_ERROR.getStatusCode();
+ if (!SecurityUtils.isAdministrator())
+ logger.error("Error serving request", exception);
}
}