Skip to content

The Unified and Autonomous Development Platform

fix: Click to iteration button from board lead to exception (OD-2407)

Robin Shen245672b4d8f5
diff --git a/server-core/src/main/java/io/onedev/server/web/component/iteration/list/IterationListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/iteration/list/IterationListPanel.java
index 419e22d815..fd063cb7d8 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/iteration/list/IterationListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/iteration/list/IterationListPanel.java
@@ -244,7 +244,7 @@ public class IterationListPanel extends GenericPanel<Project> {
});
- columns.add(new AbstractColumn<>(Model.of("Due Date")) {
+ columns.add(new AbstractColumn<>(Model.of("Start/Due Date")) {
@Override
public String getCssClass() {
diff --git a/server-core/src/main/java/io/onedev/server/web/util/editbean/IterationEditBean.java b/server-core/src/main/java/io/onedev/server/web/util/editbean/IterationEditBean.java
index af3469e37d..e73190866e 100644
--- a/server-core/src/main/java/io/onedev/server/web/util/editbean/IterationEditBean.java
+++ b/server-core/src/main/java/io/onedev/server/web/util/editbean/IterationEditBean.java
@@ -102,9 +102,13 @@ public class IterationEditBean implements Validatable, Serializable {
iteration.setDescription(getDescription());
if (getStartDate() != null) {
iteration.setStartDay(DateUtils.toLocalDate(getStartDate()).toEpochDay());
+ } else {
+ iteration.setStartDay(null);
}
if (getDueDate() != null) {
iteration.setDueDay(DateUtils.toLocalDate(getDueDate()).toEpochDay());
+ } else {
+ iteration.setDueDay(null);
}
}
@@ -137,8 +141,16 @@ public class IterationEditBean implements Validatable, Serializable {
bean.namePrefix = namePrefix;
bean.setName(iteration.getName());
bean.setDescription(iteration.getDescription());
- bean.setStartDate(toDate(ofEpochDay(iteration.getStartDay()).atStartOfDay()));
- bean.setDueDate(toDate(ofEpochDay(iteration.getDueDay()).atStartOfDay()));
+ if (iteration.getStartDay() != null) {
+ bean.setStartDate(toDate(ofEpochDay(iteration.getStartDay()).atStartOfDay()));
+ } else {
+ bean.setStartDate(null);
+ }
+ if (iteration.getDueDay() != null) {
+ bean.setDueDate(toDate(ofEpochDay(iteration.getDueDay()).atStartOfDay()));
+ } else {
+ bean.setDueDate(null);
+ }
return bean;
}