core
/
gitea
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes #6446 - Sort team members and team's repositories (#6525) 

* sort team's repositories by name

* sort team members by display name
This commit is contained in:
ngourdon 2019-04-07 15:44:34 +02:00 committed by zeripath
parent 6293736d02
commit 592e6c398e
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
models/org_team.go
View File

@ -8,6 +8,7 @@ package models
import ( import (
"errors" "errors"
"fmt" "fmt"
"sort"
"strings" "strings"
"code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/log"
@ -77,7 +78,9 @@ func (t *Team) IsMember(userID int64) bool {
func (t *Team) getRepositories(e Engine) error { func (t *Team) getRepositories(e Engine) error {
return e.Join("INNER", "team_repo", "repository.id = team_repo.repo_id"). 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. // GetRepositories returns all repositories in team of organization.
@ -546,6 +549,9 @@ func getTeamMembers(e Engine, teamID int64) (_ []*User, err error) {
} }
members[i] = member members[i] = member
} }
sort.Slice(members, func(i, j int) bool {
return members[i].DisplayName() < members[j].DisplayName()
})
return members, nil return members, nil
} }