mirror of
				https://github.com/go-gitea/gitea.git
				synced 2025-10-31 21:28:11 +09:00 
			
		
		
		
	Add order by for assignee no sort issue (#20053)
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
This commit is contained in:
		| @@ -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 | ||||
|   | ||||
| @@ -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) | ||||
| } | ||||
|   | ||||
| @@ -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) | ||||
| } | ||||
|   | ||||
| @@ -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" | ||||
| } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user