Skip to content

The Unified and Autonomous Development Platform

Some minor bug fixes

Robin Shenee44f342dbd8
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java
index 8c1cf6d35f..a29882e198 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentManager.java
@@ -91,11 +91,14 @@ public class DefaultCodeCommentManager extends BaseEntityManager<CodeComment> im
@Override
public void save(CodeComment comment) {
if (comment.isNew()) {
- CodeCommentCreated event = new CodeCommentCreated(comment);
- comment.setLastUpdate(event.getLastUpdate());
+ LastUpdate lastUpdate = new LastUpdate();
+ lastUpdate.setUser(comment.getUser());
+ lastUpdate.setActivity("added");
+ lastUpdate.setDate(comment.getCreateDate());
+ comment.setLastUpdate(lastUpdate);
dao.persist(comment);
-
- listenerRegistry.post(event);
+
+ listenerRegistry.post(new CodeCommentCreated(comment));
PullRequest request = comment.getCompareContext().getPullRequest();
if (request != null && comment.getCreateDate().after(request.getLastUpdate().getDate()))
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
index ce80fcad12..bc9bd08359 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
@@ -88,7 +88,6 @@ import io.onedev.server.model.support.issue.changedata.IssueChangeData;
import io.onedev.server.model.support.issue.changedata.IssueProjectChangeData;
import io.onedev.server.model.support.issue.field.spec.FieldSpec;
import io.onedev.server.persistence.SequenceGenerator;
-import io.onedev.server.persistence.SessionManager;
import io.onedev.server.persistence.TransactionManager;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
@@ -164,8 +163,6 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
private final IssueLinkManager linkManager;
- private final SessionManager sessionManager;
-
private final ClusterManager clusterManager;
private final IssueChangeManager changeManager;
@@ -182,8 +179,7 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
RoleManager roleManager, AttachmentManager attachmentStorageManager,
IssueCommentManager commentManager, EntityReferenceManager entityReferenceManager,
LinkSpecManager linkSpecManager, IssueLinkManager linkManager,
- IssueAuthorizationManager authorizationManager, SessionManager sessionManager,
- IssueChangeManager changeManager) {
+ IssueAuthorizationManager authorizationManager, IssueChangeManager changeManager) {
super(dao);
this.fieldManager = fieldManager;
this.queryPersonalizationManager = queryPersonalizationManager;
@@ -199,7 +195,6 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
this.commentManager = commentManager;
this.entityReferenceManager = entityReferenceManager;
this.authorizationManager = authorizationManager;
- this.sessionManager = sessionManager;
this.clusterManager = clusterManager;
this.changeManager = changeManager;
@@ -265,7 +260,11 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
issue.setNumberScope(issue.getProject().getForkRoot());
issue.setNumber(getNextNumber(issue.getNumberScope()));
- issue.setLastUpdate(new IssueOpened(issue).getLastUpdate());
+ LastUpdate lastUpdate = new LastUpdate();
+ lastUpdate.setUser(issue.getSubmitter());
+ lastUpdate.setActivity("opened");
+ lastUpdate.setDate(issue.getSubmitDate());
+ issue.setLastUpdate(lastUpdate);
save(issue);
@@ -279,16 +278,7 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
issue.getAuthorizations().add(authorization);
authorizationManager.save(authorization);
- Long issueId = issue.getId();
- sessionManager.runAsyncAfterCommit(new Runnable() {
-
- @Override
- public void run() {
- listenerRegistry.post(new IssueOpened(load(issueId)));
- }
-
- });
-
+ listenerRegistry.post(new IssueOpened(issue));
}
@Transactional
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 13c7f787a5..2cee19ff4e 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
@@ -359,8 +359,11 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>
request.setNumberScope(request.getTargetProject().getForkRoot());
request.setNumber(numberGenerator.getNextSequence(request.getNumberScope()));
- PullRequestOpened event = new PullRequestOpened(request);
- request.setLastUpdate(event.getLastUpdate());
+ LastUpdate lastUpdate = new LastUpdate();
+ lastUpdate.setUser(request.getSubmitter());
+ lastUpdate.setActivity("opened");
+ lastUpdate.setDate(request.getSubmitDate());
+ request.setLastUpdate(lastUpdate);
dao.persist(request);
@@ -384,7 +387,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>
checkAsync(request, false);
- listenerRegistry.post(event);
+ listenerRegistry.post(new PullRequestOpened(request));
}
private void closeAsMerged(PullRequest request, boolean dueToMerged) {
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 f85fdb9ee7..a658334d4f 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
@@ -15,4 +15,8 @@
}
.issue-detail .transition-option .modal-footer>* {
margin-left: 0;
+}
+
+.issue-detail .issue-pull-requests .operations {
+ margin-bottom: 0.5rem !important;
}
\ No newline at end of file
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.html
index 19bee35014..1786171f4a 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
@@ -27,7 +27,7 @@
</div>
<div wicket:id="requestSummary" class="summary mb-4 font-size-h6">
<wicket:enclosure>
- <div class="text-danger">
+ <div class="text-warning">
<wicket:svg href="exclamation-circle" class="icon"></wicket:svg> <span wicket:id="checkError"></span>
</div>
</wicket:enclosure>
@@ -55,13 +55,13 @@
<div wicket:id="calculatedMergePreview" class="calculated-merge-preview text-success">
<wicket:svg href="tick-circle" class="icon"></wicket:svg> Able to merge without conflicts
</div>
- <div wicket:id="hasMergeConflict" class="has-merge-conflict text-danger">
+ <div wicket:id="hasMergeConflict" class="has-merge-conflict text-warning">
<wicket:svg href="exclamation-circle" class="icon"></wicket:svg> There are merge conflicts.
<wicket:enclosure child="resolveInstructions">
Please follow <a wicket:id="resolveInstructions" class="link-primary" href="javascript:void(0);">this instruction</a> to resolve the conflicts
</wicket:enclosure>
</div>
- <div wicket:id="noValidCommitSignature" class="no-valid-commit-signature text-danger">
+ <div wicket:id="noValidCommitSignature" class="no-valid-commit-signature text-warning">
<wicket:svg href="times-circle" class="icon"></wicket:svg> Pull request can not be merged now as valid signature is required for head commit
</div>
<div wicket:id="requestedForChanges" class="requested-for-changes text-warning">
@@ -70,7 +70,7 @@
<div wicket:id="waitingForReviews" class="waiting-for-reviews text-warning">
<wicket:svg href="clock" class="icon"></wicket:svg> Pull request can not be merged now as it is <a class="more-info d-inline link-primary">pending review</a>
</div>
- <div wicket:id="unsuccessfulBuilds" class="unsuccessful-builds text-danger">
+ <div wicket:id="unsuccessfulBuilds" class="unsuccessful-builds text-warning">
<wicket:svg href="times-circle" class="icon"></wicket:svg> Pull request can not be merged now as <a class="more-info d-inline link-primary">required builds</a> are not successful
</div>
<div wicket:id="unfinishedBuilds" class="unfinished-builds text-warning">