Skip to content

The Unified and Autonomous Development Platform

Minor bug fixes

Robin Shena8b8d95d7ba0
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
index 730be7b156..602d4ddaee 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
@@ -687,9 +687,14 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> im
public void on(BuildEvent event) {
Build build = event.getBuild();
if (build.getRequest() != null) {
- MergePreview mergePreview = build.getRequest().getMergePreview();
- if (mergePreview != null && build.getCommitHash().equals(mergePreview.getMergeCommitHash()))
- listenerRegistry.post(new PullRequestBuildEvent(build));
+ if (build.getRequest().isDiscarded()) {
+ if (build.getRequest().getLatestUpdate().getTargetHeadCommitHash().equals(build.getCommitHash()))
+ listenerRegistry.post(new PullRequestBuildEvent(build));
+ } else {
+ MergePreview mergePreview = build.getRequest().getMergePreview();
+ if (mergePreview != null && build.getCommitHash().equals(mergePreview.getMergeCommitHash()))
+ listenerRegistry.post(new PullRequestBuildEvent(build));
+ }
}
}
diff --git a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestChangeEvent.java b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestChangeEvent.java
index 4a40dccde3..aa9e334813 100644
--- a/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestChangeEvent.java
+++ b/server-core/src/main/java/io/onedev/server/event/pullrequest/PullRequestChangeEvent.java
@@ -43,7 +43,7 @@ public class PullRequestChangeEvent extends PullRequestEvent implements Markdown
MergePreview preview = getRequest().getMergePreview();
commitId = ObjectId.fromString(preview.getMergeCommitHash());
} else if (change.getData() instanceof PullRequestDiscardData) {
- commitId = ObjectId.fromString(getRequest().getTarget().getObjectName());
+ commitId = ObjectId.fromString(getRequest().getLatestUpdate().getTargetHeadCommitHash());
} else {
commitId = ObjectId.zeroId();
}
diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequest.java b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
index 68fa371f83..66a48805a1 100644
--- a/server-core/src/main/java/io/onedev/server/model/PullRequest.java
+++ b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
@@ -734,14 +734,18 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attach
public Collection<Build> getCurrentBuilds() {
if (currentBuilds == null) {
+ currentBuilds = new ArrayList<>();
MergePreview preview = getMergePreview();
if (preview != null) {
- currentBuilds = builds.stream()
+ currentBuilds.addAll(builds.stream()
.filter(it->it.getCommitHash().equals(preview.getMergeCommitHash()))
- .collect(Collectors.toList());
- } else {
- currentBuilds = new ArrayList<>();
+ .collect(Collectors.toList()));
}
+ if (isDiscarded()) {
+ currentBuilds.addAll(builds.stream()
+ .filter(it->it.getCommitHash().equals(getLatestUpdate().getTargetHeadCommitHash()))
+ .collect(Collectors.toList()));
+ }
}
return currentBuilds;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/pull-request-jobs.css b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/pull-request-jobs.css
index 0adbebe9cc..11539afde4 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/pull-request-jobs.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/pull-request-jobs.css
@@ -1,5 +1,6 @@
.pull-request-jobs>.job {
margin-right: 1rem;
+ margin-bottom: 0.5rem;
}
.pull-request-jobs>.job:last-child {
margin-right: 0;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html
index b70ffb769b..0fb3ca4f03 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html
@@ -40,8 +40,8 @@
</div>
</div>
<div class="secondary d-flex flex-wrap">
- <div class="status flex-shrink-0 mr-3"><span wicket:id="status"></span></div>
- <div class="review mr-3" wicket:id="reviews"></div>
+ <div class="status flex-shrink-0 mr-3 mb-2"><span wicket:id="status"></span></div>
+ <div class="review mr-3 mb-2" wicket:id="reviews"></div>
<div class="jobs mr-3" wicket:id="jobs"></div>
<div class="branches flex-shrink-0 d-none d-lg-block mr-3">
<a wicket:id="target" title="Target"></a>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/savedquery/saved-queries.css b/server-core/src/main/java/io/onedev/server/web/component/savedquery/saved-queries.css
index b7d6b5d6b8..d904edc33a 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/savedquery/saved-queries.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/savedquery/saved-queries.css
@@ -1,7 +1,3 @@
-.saved-queries {
- max-width: 300px;
-}
-
.saved-queries > .card-body .watch-status:after,
.saved-queries > .card-body .subscription-status:after {
display: none;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/base.css b/server-core/src/main/java/io/onedev/server/web/page/base/base.css
index b6ad945db2..986aa5b1a5 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/base/base.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/base/base.css
@@ -484,6 +484,7 @@ pre {
.side-main>.side {
margin-right: 2rem;
flex: 0 0 auto;
+ max-width: 300px;
}
.side-main>.main {
flex: 1 1 0;
@@ -495,6 +496,7 @@ pre {
}
.side-main.side-main-wrap>* {
flex: 0 0 100%;
+ max-width: inherit;
}
.side-main.side-main-wrap>.side {
margin-right: 0;