From 2e66b35e1b47029779406fa17b8c59c2d4010c50 Mon Sep 17 00:00:00 2001 From: Nicolas Gourdon Date: Fri, 5 Apr 2019 22:01:13 +0200 Subject: [PATCH 1/2] sort team's repositories by name --- models/org_team.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/models/org_team.go b/models/org_team.go index ccee9f544b65e..73bf943eb0d9f 100644 --- a/models/org_team.go +++ b/models/org_team.go @@ -77,7 +77,9 @@ func (t *Team) IsMember(userID int64) bool { func (t *Team) getRepositories(e Engine) error { return e.Join("INNER", "team_repo", "repository.id = team_repo.repo_id"). - Where("team_repo.team_id=?", t.ID).Find(&t.Repos) + Where("team_repo.team_id=?", t.ID). + OrderBy("repository.name"). + Find(&t.Repos) } // GetRepositories returns all repositories in team of organization. From 89c02d58fec5f1985c85890b8d8fac562d618c9a Mon Sep 17 00:00:00 2001 From: Nicolas Gourdon Date: Fri, 5 Apr 2019 22:06:36 +0200 Subject: [PATCH 2/2] sort team members by display name --- models/org_team.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/models/org_team.go b/models/org_team.go index 73bf943eb0d9f..4e496e2f72e7a 100644 --- a/models/org_team.go +++ b/models/org_team.go @@ -8,6 +8,7 @@ package models import ( "errors" "fmt" + "sort" "strings" "code.gitea.io/gitea/modules/log" @@ -548,6 +549,9 @@ func getTeamMembers(e Engine, teamID int64) (_ []*User, err error) { } members[i] = member } + sort.Slice(members, func(i, j int) bool { + return members[i].DisplayName() < members[j].DisplayName() + }) return members, nil }