Skip to content

The Unified and Autonomous Development Platform

Minor adjustment of pull request review process

Robin Shena4f1ab80d650
diff --git a/server-core/src/main/java/io/onedev/server/web/component/sidebar/sidebar.css b/server-core/src/main/java/io/onedev/server/web/component/sidebar/sidebar.css
index 5ca3a2f86e..3122449e26 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/sidebar/sidebar.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/sidebar/sidebar.css
@@ -8,7 +8,7 @@
overflow: hidden;
width: 240px;
border-left: 1px solid #FAFAFA;
- border-right: 4px solid #EEE;
+ border-right: 4px solid #E0E0E0;
z-index: 210;
}
.sidebar .fa, .sidebar .fa-ext {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/build-detail.css b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/build-detail.css
index 6ca531ee2e..497054e971 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/build-detail.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/build-detail.css
@@ -55,7 +55,8 @@
}
#build-detail .side-info {
box-shadow: none;
- border-left-width: 2px;
+ border-left-width: 4px;
+ border-color: #EEE;
display: block !important;
}
#build-detail a.more-info, #build-detail .side-info>a.close {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/issue-detail.css b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/issue-detail.css
index 53ceb857b6..00213a811b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/issue-detail.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/issue-detail.css
@@ -16,7 +16,8 @@
}
#issue-detail .side-info {
box-shadow: none;
- border-left-width: 2px;
+ border-left-width: 4px;
+ border-color: #EEE;
display: block !important;
}
#issue-detail .issue-operations a.more-info, #issue-detail .side-info>a.close {
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.java
index 30f8c2a495..48eefa6465 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
@@ -33,7 +33,13 @@ public enum PullRequestOperation {
@Override
public boolean canOperate(PullRequest request) {
- return canReview(request) && request.isOpen();
+ if (request.isOpen()) {
+ PullRequestReview review = request.getReview(SecurityUtils.getUser());
+ return review != null && review.getExcludeDate() == null
+ && (review.getResult() == null || !review.getResult().isApproved());
+ } else {
+ return false;
+ }
}
@Override
@@ -54,7 +60,13 @@ public enum PullRequestOperation {
@Override
public boolean canOperate(PullRequest request) {
- return canReview(request) && request.isOpen();
+ if (request.isOpen()) {
+ PullRequestReview review = request.getReview(SecurityUtils.getUser());
+ return review != null && review.getExcludeDate() == null
+ && (review.getResult() == null || review.getResult().isApproved());
+ } else {
+ return false;
+ }
}
@Override
@@ -133,11 +145,6 @@ public enum PullRequestOperation {
};
- private static boolean canReview(PullRequest request) {
- PullRequestReview review = request.getReview(SecurityUtils.getUser());
- return review != null && review.getExcludeDate() == null;
- }
-
public abstract void operate(PullRequest request, @Nullable String comment);
public abstract boolean canOperate(PullRequest request);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css
index c51f739257..210eaa5bdf 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css
@@ -186,7 +186,8 @@ ul>li>a.code-comments.new .fa-circle {
}
#request-detail .side-info {
box-shadow: none;
- border-left-width: 2px;
+ border-left-width: 4px;
+ border-color: #EEE;
display: block !important;
}
#request-detail .side-info.closed {