From 592e6c398e6c05776d09822e8663928a947c5b90 Mon Sep 17 00:00:00 2001
From: ngourdon <31291059+ngourdon@users.noreply.github.com>
Date: Sun, 7 Apr 2019 15:44:34 +0200
Subject: [PATCH] Fixes #6446 - Sort team members and team's repositories
 (#6525)

* sort team's repositories by name

* sort team members by display name
---
 models/org_team.go | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/models/org_team.go b/models/org_team.go
index ccee9f544..4e496e2f7 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"
@@ -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
 }