Skip to content

Commit 78e8296

Browse files
authored
Rename repo_model.SearchOrderByMap to repo_model.OrderByMap (#31359)
#30876 (comment)
1 parent e37ecd1 commit 78e8296

File tree

4 files changed

+22
-22
lines changed

4 files changed

+22
-22
lines changed

models/repo/search.go

+19-19
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ package repo
55

66
import "code.gitea.io/gitea/models/db"
77

8-
// SearchOrderByMap represents all possible search order
9-
var SearchOrderByMap = map[string]map[string]db.SearchOrderBy{
8+
// OrderByMap represents all possible search order
9+
var OrderByMap = map[string]map[string]db.SearchOrderBy{
1010
"asc": {
1111
"alpha": "owner_name ASC, name ASC",
1212
"created": db.SearchOrderByOldest,
@@ -31,22 +31,22 @@ var SearchOrderByMap = map[string]map[string]db.SearchOrderBy{
3131
},
3232
}
3333

34-
// SearchOrderByFlatMap is similar to SearchOrderByMap but use human language keywords
34+
// OrderByFlatMap is similar to OrderByMap but use human language keywords
3535
// to decide between asc and desc
36-
var SearchOrderByFlatMap = map[string]db.SearchOrderBy{
37-
"newest": SearchOrderByMap["desc"]["created"],
38-
"oldest": SearchOrderByMap["asc"]["created"],
39-
"leastupdate": SearchOrderByMap["asc"]["updated"],
40-
"reversealphabetically": SearchOrderByMap["desc"]["alpha"],
41-
"alphabetically": SearchOrderByMap["asc"]["alpha"],
42-
"reversesize": SearchOrderByMap["desc"]["size"],
43-
"size": SearchOrderByMap["asc"]["size"],
44-
"reversegitsize": SearchOrderByMap["desc"]["git_size"],
45-
"gitsize": SearchOrderByMap["asc"]["git_size"],
46-
"reverselfssize": SearchOrderByMap["desc"]["lfs_size"],
47-
"lfssize": SearchOrderByMap["asc"]["lfs_size"],
48-
"moststars": SearchOrderByMap["desc"]["stars"],
49-
"feweststars": SearchOrderByMap["asc"]["stars"],
50-
"mostforks": SearchOrderByMap["desc"]["forks"],
51-
"fewestforks": SearchOrderByMap["asc"]["forks"],
36+
var OrderByFlatMap = map[string]db.SearchOrderBy{
37+
"newest": OrderByMap["desc"]["created"],
38+
"oldest": OrderByMap["asc"]["created"],
39+
"leastupdate": OrderByMap["asc"]["updated"],
40+
"reversealphabetically": OrderByMap["desc"]["alpha"],
41+
"alphabetically": OrderByMap["asc"]["alpha"],
42+
"reversesize": OrderByMap["desc"]["size"],
43+
"size": OrderByMap["asc"]["size"],
44+
"reversegitsize": OrderByMap["desc"]["git_size"],
45+
"gitsize": OrderByMap["asc"]["git_size"],
46+
"reverselfssize": OrderByMap["desc"]["lfs_size"],
47+
"lfssize": OrderByMap["asc"]["lfs_size"],
48+
"moststars": OrderByMap["desc"]["stars"],
49+
"feweststars": OrderByMap["asc"]["stars"],
50+
"mostforks": OrderByMap["desc"]["forks"],
51+
"fewestforks": OrderByMap["asc"]["forks"],
5252
}

routers/api/v1/repo/repo.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ func Search(ctx *context.APIContext) {
184184
if len(sortOrder) == 0 {
185185
sortOrder = "asc"
186186
}
187-
if searchModeMap, ok := repo_model.SearchOrderByMap[sortOrder]; ok {
187+
if searchModeMap, ok := repo_model.OrderByMap[sortOrder]; ok {
188188
if orderBy, ok := searchModeMap[sortMode]; ok {
189189
opts.OrderBy = orderBy
190190
} else {

routers/web/explore/repo.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) {
6363
sortOrder = setting.UI.ExploreDefaultSort
6464
}
6565

66-
if order, ok := repo_model.SearchOrderByFlatMap[sortOrder]; ok {
66+
if order, ok := repo_model.OrderByFlatMap[sortOrder]; ok {
6767
orderBy = order
6868
} else {
6969
sortOrder = "recentupdate"

routers/web/repo/repo.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -616,7 +616,7 @@ func SearchRepo(ctx *context.Context) {
616616
if len(sortOrder) == 0 {
617617
sortOrder = "asc"
618618
}
619-
if searchModeMap, ok := repo_model.SearchOrderByMap[sortOrder]; ok {
619+
if searchModeMap, ok := repo_model.OrderByMap[sortOrder]; ok {
620620
if orderBy, ok := searchModeMap[sortMode]; ok {
621621
opts.OrderBy = orderBy
622622
} else {

0 commit comments

Comments
 (0)