Skip to content

Add pagination, search, and descriptions to org teams list #37084

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
majorissuerep wants to merge 1 commit into
base: main
Choose a base branch
from
+73 −30
Open

Add pagination, search, and descriptions to org teams list #37084

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 29 additions & 2 deletions routers/web/org/teams.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,40 @@ 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.FormString("q")
ctx.Data["Keyword"] = keyword

opts := &org_model.SearchTeamOptions{
ListOptions: db.ListOptions{
Page: page,
PageSize: setting.UI.MembersPagingNum,
},
OrgID: org.ID,
Keyword: keyword,
IncludeDesc: true,
}
if !ctx.Org.IsOwner && ctx.Doer != nil {
opts.UserID = ctx.Doer.ID
}

teams, total, err := org_model.SearchTeam(ctx, opts)
Copy link
Copy Markdown
Member

@bircni bircni Apr 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fires a fresh query to db again but these are alread loaded?

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

pager := context.NewPagination(total, setting.UI.MembersPagingNum, page, 5)
pager.AddParamFromRequest(ctx.Req)
ctx.Data["Page"] = pager
ctx.Data["Teams"] = teams

ctx.HTML(http.StatusOK, tplTeams)
}
Expand Down
72 changes: 44 additions & 28 deletions templates/org/team/teams.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,45 +3,61 @@
{{template "org/header" .}}
<div class="ui container">
{{template "base/alert" .}}
{{if .IsOrganizationOwner}}
<div class="flex-text-block">
<div class="tw-flex-1">{{ctx.Locale.Tr "org.teams.manage_team_member_prompt"}}</div>
<div class="flex-text-block">
<form class="tw-flex-1 ignore-dirty" action="{{.OrgLink}}/teams" method="get">
<div class="ui small action input">
<input name="q" value="{{.Keyword}}" placeholder="{{ctx.Locale.Tr "search.team_kind"}}" autofocus>
<button class="ui small button">{{svg "octicon-search"}}</button>
</div>
</form>
{{if .IsOrganizationOwner}}
<a class="ui primary button" href="{{.OrgLink}}/teams/new">{{svg "octicon-plus"}} {{ctx.Locale.Tr "org.create_new_team"}}</a>
</div>
<div class="divider"></div>
{{end}}
</div>
{{if .IsOrganizationOwner}}
<p class="tw-mt-2 tw-mb-2 tw-text-text-light-1">{{ctx.Locale.Tr "org.teams.manage_team_member_prompt"}}</p>
{{end}}

<div class="ui two column stackable grid">
<div class="divider"></div>
<div class="flex-list">
{{range .Teams}}
<div class="column">
<div class="ui top attached header">
<a class="tw-text-text" href="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}"><strong>{{.Name}}</strong></a>
<div class="ui right">
<a class="ui primary tiny button" href="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}">{{ctx.Locale.Tr "view"}}</a>
{{if .IsMember ctx $.SignedUser.ID}}
<form>
<button class="ui red tiny button delete-button" data-modal-id="leave-team"
data-url="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}/action/leave" data-datauid="{{$.SignedUser.ID}}"
data-name="{{.Name}}">{{ctx.Locale.Tr "org.teams.leave"}}</button>
</form>
{{else if $.IsOrganizationOwner}}
<form method="post" action="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}/action/join">
<button type="submit" class="ui primary tiny button" name="uid" value="{{$.SignedUser.ID}}">{{ctx.Locale.Tr "org.teams.join"}}</button>
</form>
<div class="flex-item">
<div class="flex-item-main">
<div class="flex-item-title">
<a href="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}"><strong>{{.Name}}</strong></a>
</div>
{{if .Description}}
<div class="flex-item-body">{{.Description}}</div>
{{end}}
<div class="flex-item-body tw-flex tw-gap-4 tw-text-text-light-1">
<a class="muted" href="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}">{{svg "octicon-person" 14}} {{.NumMembers}} {{ctx.Locale.Tr "org.lower_members"}}</a>
<a class="muted" href="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}/repositories">{{svg "octicon-repo" 14}} {{.NumRepos}} {{ctx.Locale.Tr "org.lower_repositories"}}</a>
</div>
<div class="flex-item-body tw-flex tw-gap-1">
{{range .Members}}
{{template "shared/user/avatarlink" dict "user" .}}
{{end}}
</div>
</div>
<div class="ui attached segment members">
{{range .Members}}
{{template "shared/user/avatarlink" dict "user" .}}
<div class="flex-item-trailing">
<a class="ui primary tiny button" href="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}">{{ctx.Locale.Tr "view"}}</a>
{{if .IsMember ctx $.SignedUser.ID}}
<form>
<button class="ui red tiny button delete-button" data-modal-id="leave-team"
data-url="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}/action/leave" data-datauid="{{$.SignedUser.ID}}"
data-name="{{.Name}}">{{ctx.Locale.Tr "org.teams.leave"}}</button>
</form>
{{else if $.IsOrganizationOwner}}
<form method="post" action="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}/action/join">
<button type="submit" class="ui primary tiny button" name="uid" value="{{$.SignedUser.ID}}">{{ctx.Locale.Tr "org.teams.join"}}</button>
</form>
{{end}}
</div>
<div class="ui bottom attached header">
<p class="team-meta"><a class="muted" href="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}">{{.NumMembers}} {{ctx.Locale.Tr "org.lower_members"}}</a> · <a class="muted" href="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}/repositories">{{.NumRepos}} {{ctx.Locale.Tr "org.lower_repositories"}}</a></p>
</div>
</div>
{{else}}
<div class="empty center">{{ctx.Locale.Tr "no_results_found"}}</div>
{{end}}
</div>
{{template "base/paginate" .}}
</div>
</div>
<div class="ui g-modal-confirm delete modal" id="leave-team">
Expand Down