Skip to content

Add order by for assignee no sort issue #20053

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jul 14, 2022
Merged

Add order by for assignee no sort issue #20053

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
827b702
Add order by for #6 assignee not sort issue.
tyroneyeh Jun 20, 2022
2da0afa
Create GetOrderBy function
tyroneyeh Jul 8, 2022
f1af291
Remove break line
tyroneyeh Jul 8, 2022
088a78c
Update models/user/user.go
tyroneyeh Jul 14, 2022
345f39b
Merge branch 'main' into 20049_issues_filter_to_assignee_sort
wxiaoguang Jul 14, 2022
9eb1875
Merge branch 'main' into 20049_issues_filter_to_assignee_sort
wxiaoguang Jul 14, 2022
dfd13f6
GetOrderBy is too general, use GetOrderByName instead
wxiaoguang Jul 14, 2022
cb38600
Merge branch 'main' into 20049_issues_filter_to_assignee_sort
wxiaoguang Jul 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion models/issues/issue_list.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
repo_model "code.gitea.io/gitea/models/repo"
user_model "code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/modules/container"
"code.gitea.io/gitea/modules/setting"

"xorm.io/builder"
)
Expand Down Expand Up @@ -234,6 +235,12 @@ func (issues IssueList) loadAssignees(ctx context.Context) error {

assignees := make(map[int64][]*user_model.User, len(issues))
issueIDs := issues.getIssueIDs()

orderBy := "name"
if setting.UI.DefaultShowFullName {
orderBy = "full_name"
}

left := len(issueIDs)
for left > 0 {
limit := db.DefaultMaxInSize
Expand All @@ -242,7 +249,7 @@ func (issues IssueList) loadAssignees(ctx context.Context) error {
}
rows, err := db.GetEngine(ctx).Table("issue_assignees").
Join("INNER", "`user`", "`user`.id = `issue_assignees`.assignee_id").
In("`issue_assignees`.issue_id", issueIDs[:limit]).
In("`issue_assignees`.issue_id", issueIDs[:limit]).OrderBy(orderBy).
Rows(new(AssigneeIssue))
if err != nil {
return err
Expand Down
1 change: 1 addition & 0 deletions models/organization/team_repo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,5 +81,6 @@ func GetTeamsWithAccessToRepo(ctx context.Context, orgID, repoID int64, mode per
Join("INNER", "team_repo", "team_repo.team_id = team.id").
And("team_repo.org_id = ?", orgID).
And("team_repo.repo_id = ?", repoID).
OrderBy("name").
Find(&teams)
}
16 changes: 14 additions & 2 deletions models/repo/user_repo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"code.gitea.io/gitea/models/db"
"code.gitea.io/gitea/models/perm"
user_model "code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/modules/setting"
api "code.gitea.io/gitea/modules/structs"

"xorm.io/builder"
Expand Down Expand Up @@ -109,7 +110,13 @@ func GetRepoAssignees(ctx context.Context, repo *Repository) (_ []*user_model.Us
// and just waste 1 unit is cheaper than re-allocate memory once.
users := make([]*user_model.User, 0, len(userIDs)+1)
if len(userIDs) > 0 {
if err = e.In("id", userIDs).Find(&users); err != nil {

orderBy := "name"
if setting.UI.DefaultShowFullName {
orderBy = "full_name"
}

if err = e.In("id", userIDs).OrderBy(orderBy).Find(&users); err != nil {
return nil, err
}
}
Expand Down Expand Up @@ -167,6 +174,11 @@ func GetReviewers(ctx context.Context, repo *Repository, doerID, posterID int64)
)))))
}

orderBy := "name"
if setting.UI.DefaultShowFullName {
orderBy = "full_name"
}

users := make([]*user_model.User, 0, 8)
return users, db.GetEngine(ctx).Where(cond).OrderBy("name").Find(&users)
return users, db.GetEngine(ctx).Where(cond).OrderBy(orderBy).Find(&users)
}