The Unified and Autonomous Development Platform
Fix issue #240 - Error when viewing File Changes in PR preview
Robin Shen9a6726391bdd
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 dee4254304..40a02c559d 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@@ -431,12 +431,12 @@ public class NewPullRequestPage extends ProjectPage implements RevisionDiff.Anno@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(!getPullRequest().isMerged());+ setVisible(!NewPullRequestPage.this.getPullRequest().isMerged());}@Overrideprotected CommitQuery getBaseQuery() {- PullRequest request = getPullRequest();+ PullRequest request = NewPullRequestPage.this.getPullRequest();List<Revision> revisions = new ArrayList<>();revisions.add(new Revision(request.getBaseCommitHash(), Revision.Scope.SINCE));revisions.add(new Revision(request.getLatestUpdate().getHeadCommitHash(), Revision.Scope.UNTIL));@@ -445,7 +445,7 @@ public class NewPullRequestPage extends ProjectPage implements RevisionDiff.Anno@Overrideprotected Project getProject() {- return getPullRequest().getSourceProject();+ return NewPullRequestPage.this.getPullRequest().getSourceProject();}}.setOutputMarkupId(true);@@ -535,7 +535,7 @@ public class NewPullRequestPage extends ProjectPage implements RevisionDiff.Anno@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(!getPullRequest().isMerged());+ setVisible(!NewPullRequestPage.this.getPullRequest().isMerged());}};@@ -698,19 +698,20 @@ public class NewPullRequestPage extends ProjectPage implements RevisionDiff.Anno@Overridepublic String getObject() {- return getPullRequest().getDescription();+ return NewPullRequestPage.this.getPullRequest().getDescription();}@Overridepublic void setObject(String object) {- getPullRequest().setDescription(object);+ NewPullRequestPage.this.getPullRequest().setDescription(object);}}, false) {@Overrideprotected AttachmentSupport getAttachmentSupport() {- return new ProjectAttachmentSupport(target.getProject(), getPullRequest().getUUID(),+ return new ProjectAttachmentSupport(target.getProject(),+ NewPullRequestPage.this.getPullRequest().getUUID(),SecurityUtils.canManagePullRequests(target.getProject()));}