diff options
| -rw-r--r-- | models/repo.go | 6 | ||||
| -rw-r--r-- | models/user.go | 7 |
2 files changed, 6 insertions, 7 deletions
diff --git a/models/repo.go b/models/repo.go index 4c19037624..abe67a6d8e 100644 --- a/models/repo.go +++ b/models/repo.go @@ -1527,9 +1527,6 @@ func SearchRepositoryByName(opts *SearchRepoOptions) (repos []*Repository, _ int if !opts.Private { sess.And("is_private=?", false) } - if len(opts.OrderBy) > 0 { - sess.OrderBy(opts.OrderBy) - } var countSess xorm.Session countSess = *sess @@ -1538,6 +1535,9 @@ func SearchRepositoryByName(opts *SearchRepoOptions) (repos []*Repository, _ int return nil, 0, fmt.Errorf("Count: %v", err) } + if len(opts.OrderBy) > 0 { + sess.OrderBy(opts.OrderBy) + } return repos, count, sess.Limit(opts.PageSize, (opts.Page-1)*opts.PageSize).Find(&repos) } diff --git a/models/user.go b/models/user.go index a95e1f1925..82f927891c 100644 --- a/models/user.go +++ b/models/user.go @@ -1139,11 +1139,7 @@ func SearchUserByName(opts *SearchUserOptions) (users []*User, _ int64, _ error) users = make([]*User, 0, opts.PageSize) // Append conditions - fmt.Println(opts.Type) sess := x.Where("lower_name like ?", "%"+opts.Keyword+"%").And("type = ?", opts.Type) - if len(opts.OrderBy) > 0 { - sess.OrderBy(opts.OrderBy) - } var countSess xorm.Session countSess = *sess @@ -1152,6 +1148,9 @@ func SearchUserByName(opts *SearchUserOptions) (users []*User, _ int64, _ error) return nil, 0, fmt.Errorf("Count: %v", err) } + if len(opts.OrderBy) > 0 { + sess.OrderBy(opts.OrderBy) + } return users, count, sess.Limit(opts.PageSize, (opts.Page-1)*opts.PageSize).Find(&users) } |