Skip to content

The Unified and Autonomous Development Platform

feat(pull-request): add age display to pull request activities

Robin Shen77de826d6e17
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.html
index 64207cb7ac..ae94f8696c 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.html
@@ -4,11 +4,11 @@
<div class="head">
<span wicket:id="user"></span>
<span wicket:id="description"></span>
+ <span wicket:id="age"></span>
<span wicket:id="mergeCommit">
- <a wicket:id="hashLink" class="hash"><span wicket:id="hash"></span></a>
- <a wicket:id="copyHash"><wicket:svg href="copy" class="icon icon-sm"></wicket:svg></a>
+ (<wicket:t>merge commit</wicket:t>: <a wicket:id="hashLink" class="hash font-size-sm"><span wicket:id="hash"></span></a>
+ <a wicket:id="copyHash"><wicket:svg href="copy" class="icon icon-sm"></wicket:svg></a>)
</span>
- <span wicket:id="age"></span>
<a wicket:id="changes" class="since-changes ml-2" t:data-tippy-content="Changes since this action"><wicket:svg href="diff" class="icon"></wicket:svg></a>
</div>
<div wicket:id="body" class="body mt-3"></div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.java
index 2bff3f7a51..aed25ccde9 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.java
@@ -36,6 +36,9 @@ class PullRequestChangePanel extends Panel {
add(new UserIdentPanel("user", change.getUser(), Mode.AVATAR_AND_NAME));
add(new Label("description", change.getData().getActivity()));
+ add(new Label("age", DateUtils.formatAge(change.getDate()))
+ .add(new AttributeAppender("data-tippy-content", DateUtils.formatDateTime(change.getDate()))));
+
var mergeCommit = new WebMarkupContainer("mergeCommit");
var mergePreview = change.getRequest().getMergePreview();
if (change.getData() instanceof PullRequestMergeData
@@ -52,9 +55,7 @@ class PullRequestChangePanel extends Panel {
mergeCommit.setVisible(false);
}
add(mergeCommit);
-
- add(new Label("age", DateUtils.formatAge(change.getDate()))
- .add(new AttributeAppender("data-tippy-content", DateUtils.formatDateTime(change.getDate()))));
+
add(new SinceChangesLink("changes", new AbstractReadOnlyModel<PullRequest>() {
@Override