From 67bc04fe21e279805f2f4163791e28272e8133b1 Mon Sep 17 00:00:00 2001 From: finga Date: Wed, 6 Oct 2021 22:36:24 +0200 Subject: [PATCH] Fix problem when database ID is not incremented as expected (#17229) Although #17124 fixed the same issue for the feed, some other parts with the same issue were found. Co-authored-by: finga --- models/admin.go | 2 +- models/issue.go | 2 +- models/token.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/models/admin.go b/models/admin.go index 27a2032e2c..a003aff7e6 100644 --- a/models/admin.go +++ b/models/admin.go @@ -107,7 +107,7 @@ func Notices(page, pageSize int) ([]*Notice, error) { notices := make([]*Notice, 0, pageSize) return notices, db.GetEngine(db.DefaultContext). Limit(pageSize, (page-1)*pageSize). - Desc("id"). + Desc("created_unix"). Find(¬ices) } diff --git a/models/issue.go b/models/issue.go index 9b02a83900..b62394919c 100644 --- a/models/issue.go +++ b/models/issue.go @@ -843,7 +843,7 @@ func (issue *Issue) GetLastEventLabel() string { func (issue *Issue) GetLastComment() (*Comment, error) { var c Comment exist, err := db.GetEngine(db.DefaultContext).Where("type = ?", CommentTypeComment). - And("issue_id = ?", issue.ID).Desc("id").Get(&c) + And("issue_id = ?", issue.ID).Desc("created_unix").Get(&c) if err != nil { return nil, err } diff --git a/models/token.go b/models/token.go index 3cffdd9ba2..b3712fce5e 100644 --- a/models/token.go +++ b/models/token.go @@ -161,7 +161,7 @@ func ListAccessTokens(opts ListAccessTokensOptions) ([]*AccessToken, error) { sess = sess.Where("name=?", opts.Name) } - sess = sess.Desc("id") + sess = sess.Desc("created_unix") if opts.Page != 0 { sess = db.SetSessionPagination(sess, &opts)