The Unified and Autonomous Development Platform
Do not display approve or "request for changes" button if pull request is closed
Robin Shen99915f45fe6b
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.htmlindex 74d0aebf3b..bb40ee8523 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html@@ -56,7 +56,7 @@</ul></div><div wicket:id="conflict" class="conflict alert alert-danger">- <span><i class="fa fa-warning"></i> There are merge conflicts.</span>+ <span>There are merge conflicts.</span><wicket:enclosure child="resolveInstructions">Please follow <a wicket:id="resolveInstructions" href="javascript:void(0);">this instruction</a> to resolve the conflicts.</wicket:enclosure>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestOperation.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestOperation.javaindex 82022ed7fc..890934f771 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestOperation.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestOperation.java@@ -34,7 +34,7 @@ public enum PullRequestOperation {@Overridepublic boolean canOperate(PullRequest request) {- return canReview(request);+ return canReview(request) && request.isOpen();}@Override@@ -55,7 +55,7 @@ public enum PullRequestOperation {@Overridepublic boolean canOperate(PullRequest request) {- return canReview(request);+ return canReview(request) && request.isOpen();}@Override