Browse Source

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

* sort team's repositories by name

* sort team members by display name
tags/v1.9.0-rc1
ngourdon 5 years ago
parent
commit
592e6c398e
1 changed files with 7 additions and 1 deletions
  1. 7
    1
      models/org_team.go

+ 7
- 1
models/org_team.go View File

@@ -8,6 +8,7 @@ package models
import (
"errors"
"fmt"
"sort"
"strings"

"code.gitea.io/gitea/modules/log"
@@ -77,7 +78,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.
@@ -546,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
}


Loading…
Cancel
Save