Mirrors/gitea
0
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-01-19 03:22:44 +01:00
Code Issues Activity

Merge 8bec3d7736fbd2d9d5d4fe305b60ed631945c53a into 393c854f7bf2ae91262f8ce111c26c4e08451e17

Browse Source
This commit is contained in:
lif 2026-01-16 16:07:59 -08:00 committed by GitHub
commit a4ef476569
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 84 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
options/locale/locale_en-US.json
View File

@ -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 <strong>will not</strong> automatically remove repositories already added with <i>All repositories</i>.",

29
routers/web/org/teams.go
View File

@ -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)
}

86
templates/org/team/teams.tmpl
View File

@ -3,44 +3,70 @@
{{template "org/header" .}}
<div class="ui container">
{{template "base/alert" .}}
{{if .IsOrganizationOwner}}
<div class="flex-text-block tw-justify-end">
<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 class="ui two column stackable grid">
<div class="list-header">
<div class="small-menu-items ui compact tiny menu list-header-search">
<a class="{{if not .Keyword}}active {{end}}item" href="{{$.OrgLink}}/teams">{{ctx.Locale.Tr "all"}}</a>
</div>
<form class="list-header-search ui small fluid action input">
<input type="text" name="q" value="{{.Keyword}}" placeholder="{{ctx.Locale.Tr "search.team_kind"}}">
{{template "shared/search/button"}}
</form>
{{if .IsOrganizationOwner}}
<a class="ui primary small button" href="{{.OrgLink}}/teams/new">{{svg "octicon-plus"}} {{ctx.Locale.Tr "org.create_new_team"}}</a>
{{end}}
</div>
<div class="divider"></div>
<div class="flex-list">
{{range .Teams}}
<div class="column">
<div class="ui top attached header">
<a class="text black" 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 tw-items-start">
<div class="flex-item-main">
<div class="flex-item-header">
<div class="flex-item-title">
{{svg "octicon-people" 16}}
<a class="text black" href="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}"><strong>{{.Name}}</strong></a>
</div>
<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>
{{if .Description}}
<div class="flex-item-body">
{{.Description}}
</div>
{{end}}
<div class="flex-item-body">
<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>
</div>
<div class="flex-item-body">
{{range .Members}}
{{template "shared/user/avatarlink" dict "user" . "Size" 28}}
{{end}}
</div>
</div>
<div class="ui attached segment members">
{{range .Members}}
{{template "shared/user/avatarlink" dict "user" .}}
{{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="flex-item">
<span class="text grey">{{ctx.Locale.Tr "org.teams.no_teams"}}</span>
</div>
{{end}}
</div>
{{template "base/paginate" .}}
</div>
</div>
<div class="ui g-modal-confirm delete modal" id="leave-team">