Skip to content

The Unified and Autonomous Development Platform

fix: Error attaching this container for rendering (OD-2463)

Robin Shene16647cbe5bd
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java
index 388871b35b..3b6aa178ca 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java
@@ -2,6 +2,7 @@ package io.onedev.server.web.component.commit.list;
import static io.onedev.server.web.translation.Translation._T;
+import java.time.LocalDate;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -46,8 +47,6 @@ import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevObject;
-import org.joda.time.DateTime;
-import org.joda.time.DateTimeZone;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -116,12 +115,11 @@ public abstract class CommitListPanel extends Panel {
private List<RevCommit> separateByDate(List<RevCommit> commits) {
List<RevCommit> separated = new ArrayList<>();
- DateTime groupTime = null;
+ LocalDate groupDate = null;
for (RevCommit commit: commits) {
- DateTime commitTime = new DateTime(commit.getCommitterIdent().getWhen()).withZone(DateTimeZone.forID(DateUtils.getZoneId().getId()));
- if (groupTime == null || commitTime.getYear() != groupTime.getYear()
- || commitTime.getDayOfYear() != groupTime.getDayOfYear()) {
- groupTime = commitTime;
+ var commitDate = DateUtils.toLocalDate(commit.getCommitterIdent().getWhen());
+ if (groupDate == null || commitDate.toEpochDay() != groupDate.toEpochDay()) {
+ groupDate = commitDate;
separated.add(null);
}
separated.add(commit);
diff --git a/server-core/src/test/java/io/onedev/server/commandhandler/ExtractTranslationKeysTest.java b/server-core/src/test/java/io/onedev/server/commandhandler/ExtractTranslationKeysTest.java
index e344d11cbd..e0fdad99d1 100644
--- a/server-core/src/test/java/io/onedev/server/commandhandler/ExtractTranslationKeysTest.java
+++ b/server-core/src/test/java/io/onedev/server/commandhandler/ExtractTranslationKeysTest.java
@@ -83,11 +83,11 @@ public class ExtractTranslationKeysTest {
+ "\t\t// Extracted keys\n"
+ "\t\tm.put(\"message1\", \"消息$100\");\n"
+ "\n"
- + "\t\tm.put(\"message2\", \n\t\t\"**** translate this ****\");\n"
+ + "\t\tm.put(\"message2\", \n\t\t\"**** translate key ****\");\n"
+ "\n"
+ "\t\t\t// Manually added keys";
assertEquals(
- "\n\t\t// Extracted keys\n\t\tm.put(\"message1\", \"消息$100\");\n\t\tm.put(\"message2\", \"**** translate this ****\");\n\t\tm.put(\"message3\", \"**** translate this ****\");\n\n\t\t\t// Manually added keys",
+ "\n\t\t// Extracted keys\n\t\tm.put(\"message1\", \"消息$100\");\n\t\tm.put(\"message2\", \"**** translate key ****\");\n\t\tm.put(\"message3\", \"**** translate key ****\");\n\n\t\t\t// Manually added keys",
ExtractTranslationKeys.updateTranslationKeys(content,
List.of("message1", "message2", "message3")));
}