Fix 500 on time in timeline API (go-gitea#21052) (go-gitea#21057)

qwerty287 · web-flow · commit 0ecbb71bee44 · 2022-09-04T16:12:37.000+01:00
Backport go-gitea#21052 Before converting a TrackedTime for the API we need to load its attributes - otherwise we get an NPE. Fix go-gitea#21041
diff --git a/modules/convert/issue_comment.go b/modules/convert/issue_comment.go
@@ -101,6 +101,12 @@ func ToTimelineComment(c *issues_model.Comment, doer *user_model.User) *api.Time
 	}
 
 	if c.Time != nil {
+		err = c.Time.LoadAttributes()
+		if err != nil {
+			log.Error("Time.LoadAttributes: %v", err)
+			return nil
+		}
+
 		comment.TrackedTime = ToTrackedTime(c.Time)
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -101,6 +101,12 @@ func ToTimelineComment(c issues_model.Comment, doer user_model.User) *api.Time`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`if c.Time != nil {`
	`104`	`+ err = c.Time.LoadAttributes()`
	`105`	`+ if err != nil {`
	`106`	`+ log.Error("Time.LoadAttributes: %v", err)`
	`107`	`+ return nil`
	`108`	`+ }`
	`109`	`+`
`104`	`110`	`comment.TrackedTime = ToTrackedTime(c.Time)`
`105`	`111`	`}`
`106`	`112`