Skip to content

Commit 6e81995

Browse files
fix(zentao): fix parsing errors for date related fields on zentao v18.10 (#7051) (#7054)
Co-authored-by: Lynwee <linwei.hou@merico.dev>
1 parent 0f11da9 commit 6e81995

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

backend/core/models/common/iso8601time.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,9 @@ func (jt Iso8601Time) MarshalJSON() ([]byte, error) {
9797
// UnmarshalJSON FIXME ...
9898
func (jt *Iso8601Time) UnmarshalJSON(b []byte) error {
9999
timeString := string(b)
100+
if timeString == `""` {
101+
return nil
102+
}
100103
if timeString == "null" {
101104
return nil
102105
}

backend/core/models/migrationscripts/archived/iso8601time.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,9 @@ func (jt *Iso8601Time) UnmarshalJSON(b []byte) error {
100100
if timeString == "null" {
101101
return nil
102102
}
103+
if timeString == `""` {
104+
return nil
105+
}
103106
if strings.Contains(timeString, "0000-00-00") {
104107
return nil
105108
}

0 commit comments

Comments
 (0)