Add order by for assignee no sort issue (#20053)

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>

diff --git a/models/issues/issue_list.go b/models/issues/issue_list.go
index 20e9949b662024f5707177d1964f31fbd2fa7f68..e311e80b1d668847a4900a9a5f7e2f1f11648b39 100644 (file)
--- a/models/issues/issue_list.go
+++ b/models/issues/issue_list.go
@@ -242,7 +242,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(user_model.GetOrderByName()).
                        Rows(new(AssigneeIssue))
                if err != nil {
                        return err

diff --git a/models/organization/team_repo.go b/models/organization/team_repo.go
index fb3f267f817af2dc7875f71ef3686f7620d03425..3ac4fa926b8396b094abc85dcc92fb390cddc6b6 100644 (file)
--- a/models/organization/team_repo.go
+++ b/models/organization/team_repo.go
@@ -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)
 }

diff --git a/models/repo/user_repo.go b/models/repo/user_repo.go
index e697505b81e4e5bb1815037cecb3ba6400a5d93a..71e0c57550c5612ba302ec936431ff4328f32a65 100644 (file)
--- a/models/repo/user_repo.go
+++ b/models/repo/user_repo.go
@@ -109,7 +109,7 @@ 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 {
+               if err = e.In("id", userIDs).OrderBy(user_model.GetOrderByName()).Find(&users); err != nil {
                        return nil, err
                }
        }
@@ -168,5 +168,5 @@ func GetReviewers(ctx context.Context, repo *Repository, doerID, posterID int64)
        }
 
        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(user_model.GetOrderByName()).Find(&users)
 }

diff --git a/models/user/user.go b/models/user/user.go
index 125c643f3ee883baedc8238dc38cafec9eca2446..fbd8df947247278350a66f4d0ae269b5ee8a94dd 100644 (file)
--- a/models/user/user.go
+++ b/models/user/user.go
@@ -1314,3 +1314,10 @@ func IsUserVisibleToViewer(ctx context.Context, u, viewer *User) bool {
        }
        return false
 }
+
+func GetOrderByName() string {
+       if setting.UI.DefaultShowFullName {
+               return "full_name, name"
+       }
+       return "name"
+}