diff --git a/options/locale/locale_en-US.json b/options/locale/locale_en-US.json index f6c2aeb3cb..5564891324 100644 --- a/options/locale/locale_en-US.json +++ b/options/locale/locale_en-US.json @@ -2811,6 +2811,7 @@ "org.teams.add_duplicate_users": "User is already a team member.", "org.teams.repos.none": "No repositories could be accessed by this team.", "org.teams.members.none": "No members on this team.", + "org.teams.no_teams": "No teams found.", "org.teams.members.blocked_user": "Cannot add the user because it is blocked by the organization.", "org.teams.specific_repositories": "Specific repositories", "org.teams.specific_repositories_helper": "Members will only have access to repositories explicitly added to the team. Selecting this will not automatically remove repositories already added with All repositories.", diff --git a/routers/web/org/teams.go b/routers/web/org/teams.go index 0ec7cfddc5..b574253de6 100644 --- a/routers/web/org/teams.go +++ b/routers/web/org/teams.go @@ -54,13 +54,38 @@ func Teams(ctx *context.Context) { ctx.Data["Title"] = org.FullName ctx.Data["PageIsOrgTeams"] = true - for _, t := range ctx.Org.Teams { + page := max(ctx.FormInt("page"), 1) + keyword := ctx.FormTrim("q") + + opts := &org_model.SearchTeamOptions{ + Keyword: keyword, + OrgID: org.ID, + IncludeDesc: true, + ListOptions: db.ListOptions{ + Page: page, + PageSize: setting.UI.MembersPagingNum, + }, + } + + teams, total, err := org_model.SearchTeam(ctx, opts) + if err != nil { + ctx.ServerError("SearchTeam", err) + return + } + + for _, t := range teams { if err := t.LoadMembers(ctx); err != nil { ctx.ServerError("GetMembers", err) return } } - ctx.Data["Teams"] = ctx.Org.Teams + + ctx.Data["Teams"] = teams + ctx.Data["Keyword"] = keyword + + pager := context.NewPagination(int(total), setting.UI.MembersPagingNum, page, 5) + pager.AddParamFromRequest(ctx.Req) + ctx.Data["Page"] = pager ctx.HTML(http.StatusOK, tplTeams) } diff --git a/templates/org/team/teams.tmpl b/templates/org/team/teams.tmpl index 50f4f7e97d..4a06889c60 100644 --- a/templates/org/team/teams.tmpl +++ b/templates/org/team/teams.tmpl @@ -3,44 +3,70 @@ {{template "org/header" .}}
{{template "base/alert" .}} - {{if .IsOrganizationOwner}} -
- {{svg "octicon-plus"}} {{ctx.Locale.Tr "org.create_new_team"}} -
-
- {{end}} -
+
+
+ {{ctx.Locale.Tr "all"}} +
+
+ + {{template "shared/search/button"}} +
+ {{if .IsOrganizationOwner}} + {{svg "octicon-plus"}} {{ctx.Locale.Tr "org.create_new_team"}} + {{end}} +
+
+ +
{{range .Teams}} -
-
- {{.Name}} -
- {{ctx.Locale.Tr "view"}} - {{if .IsMember ctx $.SignedUser.ID}} -
- -
- {{else if $.IsOrganizationOwner}} -
- -
+
+
+
+
+ {{svg "octicon-people" 16}} + {{.Name}} +
+
+ {{ctx.Locale.Tr "view"}} + {{if .IsMember ctx $.SignedUser.ID}} +
+ +
+ {{else if $.IsOrganizationOwner}} +
+ +
+ {{end}} +
+
+ {{if .Description}} +
+ {{.Description}} +
+ {{end}} +
+ {{.NumMembers}} {{ctx.Locale.Tr "org.lower_members"}} + · + {{.NumRepos}} {{ctx.Locale.Tr "org.lower_repositories"}} +
+
+ {{range .Members}} + {{template "shared/user/avatarlink" dict "user" . "Size" 28}} {{end}}
-
- {{range .Members}} - {{template "shared/user/avatarlink" dict "user" .}} - {{end}} -
-
-

{{.NumMembers}} {{ctx.Locale.Tr "org.lower_members"}} · {{.NumRepos}} {{ctx.Locale.Tr "org.lower_repositories"}}

-
+
+ {{else}} +
+ {{ctx.Locale.Tr "org.teams.no_teams"}}
{{end}}
+ + {{template "base/paginate" .}}