web/forgejo
9
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-06-20 17:17:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Fix JSON result of empty array (#5154)

Browse source
This commit is contained in:
Antoine GIRARD 2018-10-24 15:17:21 +02:00 • committed by Lunny Xiao
parent 317ddb7283
commit 70ad46133f
2 changed files with 39 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

7
models/user_heatmap.go
View file

@ -16,7 +16,8 @@ type UserHeatmapData struct {
}
// GetUserHeatmapDataByUser returns an array of UserHeatmapData
func GetUserHeatmapDataByUser(user *User) (hdata []*UserHeatmapData, err error) {
func GetUserHeatmapDataByUser(user *User) ([]*UserHeatmapData, error) {
hdata := make([]*UserHeatmapData, 0)
var groupBy string
switch {
case setting.UseSQLite3:
@ -29,12 +30,12 @@ func GetUserHeatmapDataByUser(user *User) (hdata []*UserHeatmapData, err error)
groupBy = "dateadd(DAY,0, datediff(day,0, dateadd(s, created_unix, '19700101')))"
}
err = x.Select(groupBy+" as timestamp, count(user_id) as contributions").
err := x.Select(groupBy+" as timestamp, count(user_id) as contributions").
Table("action").
Where("user_id = ?", user.ID).
And("created_unix > ?", (util.TimeStampNow() - 31536000)).
GroupBy("timestamp").
OrderBy("timestamp").
Find(&hdata)
return
return hdata, err
}