Skip to content

Commit 31236ce

Browse files
zeripathzeripath
committed
Update assignees check to include any writing team and change org sidebar (go-gitea#18680)
Backport go-gitea#18680 Following the merging of go-gitea#17811 teams can now have differing write and readonly permissions, however the assignee list will not include teams which have mixed perms. Further the org sidebar is no longer helpful as it can't describe these mixed permissions situations. Fix go-gitea#18572 Signed-off-by: Andrew Thornton <art27@cantab.net>
1 parent 6591f87 commit 31236ce

File tree

3 files changed

+88
-33
lines changed

3 files changed

+88
-33
lines changed

‎models/repo.go

+40-11
Original file line numberDiff line numberDiff line change
@@ -150,27 +150,56 @@ func getRepoAssignees(ctx context.Context, repo *repo_model.Repository) (_ []*us
150150
}
151151

152152
e := db.GetEngine(ctx)
153-
accesses := make([]*Access, 0, 10)
154-
if err = e.
153+
userIDs := make([]int64, 0, 10)
154+
if err = e.Table("access").
155155
Where("repo_id = ? AND mode >= ?", repo.ID, perm.AccessModeWrite).
156-
Find(&accesses); err != nil {
156+
Select("id").
157+
Find(&userIDs); err != nil {
157158
return nil, err
158159
}
159160

160-
// Leave a seat for owner itself to append later, but if owner is an organization
161-
// and just waste 1 unit is cheaper than re-allocate memory once.
162-
users := make([]*user_model.User, 0, len(accesses)+1)
163-
if len(accesses) > 0 {
164-
userIDs := make([]int64, len(accesses))
165-
for i := 0; i < len(accesses); i++ {
166-
userIDs[i] = accesses[i].UserID
161+
additionalUserIDs := make([]int64, 0, 10)
162+
if err = e.Table("team_user").
163+
Join("INNER", "team_repo", "`team_repo`.team_id = `team_user`.team_id").
164+
Join("INNER", "team_unit", "`team_unit`.team_id = `team_user`.team_id").
165+
Where("`team_repo`.repo_id = ? AND `team_unit`.access_mode >= ?", repo.ID, perm.AccessModeWrite).
166+
Distinct("`team_user`.uid").
167+
Select("`team_user`.uid").
168+
Find(&additionalUserIDs); err != nil {
169+
return nil, err
170+
}
171+
172+
uidMap := map[int64]bool{}
173+
i := 0
174+
for _, uid := range userIDs {
175+
if uidMap[uid] {
176+
continue
177+
}
178+
uidMap[uid] = true
179+
userIDs[i] = uid
180+
i++
181+
}
182+
userIDs = userIDs[:i]
183+
userIDs = append(userIDs, additionalUserIDs...)
184+
185+
for _, uid := range additionalUserIDs {
186+
if uidMap[uid] {
187+
continue
167188
}
189+
userIDs[i] = uid
190+
i++
191+
}
192+
userIDs = userIDs[:i]
168193

194+
// Leave a seat for owner itself to append later, but if owner is an organization
195+
// and just waste 1 unit is cheaper than re-allocate memory once.
196+
users := make([]*user_model.User, 0, len(userIDs)+1)
197+
if len(userIDs) > 0 {
169198
if err = e.In("id", userIDs).Find(&users); err != nil {
170199
return nil, err
171200
}
172201
}
173-
if !repo.Owner.IsOrganization() {
202+
if !repo.Owner.IsOrganization() && !uidMap[repo.OwnerID] {
174203
users = append(users, repo.Owner)
175204
}
176205

‎routers/web/org/teams.go

+2
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,7 @@ func TeamMembers(ctx *context.Context) {
311311
ctx.ServerError("GetMembers", err)
312312
return
313313
}
314+
ctx.Data["Units"] = unit_model.Units
314315
ctx.HTML(http.StatusOK, tplTeamMembers)
315316
}
316317

@@ -323,6 +324,7 @@ func TeamRepositories(ctx *context.Context) {
323324
ctx.ServerError("GetRepositories", err)
324325
return
325326
}
327+
ctx.Data["Units"] = unit_model.Units
326328
ctx.HTML(http.StatusOK, tplTeamRepositories)
327329
}
328330

‎templates/org/team/sidebar.tmpl

+46-22
Original file line numberDiff line numberDiff line change
@@ -25,31 +25,55 @@
2525
<span class="text grey italic">{{.i18n.Tr "org.teams.no_desc"}}</span>
2626
{{end}}
2727
</div>
28-
29-
<div class="item">
30-
{{if eq .Team.LowerName "owners"}}
28+
{{if eq .Team.LowerName "owners"}}
29+
<div class="item">
3130
{{.i18n.Tr "org.teams.owners_permission_desc" | Str2html}}
32-
{{else if (eq .Team.AccessMode 1)}}
33-
{{if .Team.IncludesAllRepositories}}
34-
{{.i18n.Tr "org.teams.all_repositories_read_permission_desc" | Str2html}}
35-
{{else}}
36-
{{.i18n.Tr "org.teams.read_permission_desc" | Str2html}}
37-
{{end}}
38-
{{else if (eq .Team.AccessMode 2)}}
39-
{{if .Team.IncludesAllRepositories}}
40-
{{.i18n.Tr "org.teams.all_repositories_write_permission_desc" | Str2html}}
31+
</div>
32+
{{else}}
33+
<div class="item">
34+
<h3>{{.i18n.Tr "org.team_access_desc"}}</h3>
35+
<ul>
36+
{{if .Team.IncludesAllRepositories}}
37+
<li>{{.i18n.Tr "org.teams.all_repositories" | Str2html}}
38+
{{else}}
39+
<li>{{.i18n.Tr "org.teams.specific_repositories" | Str2html}}
40+
{{end}}
41+
{{if .Team.CanCreateOrgRepo}}
42+
<li>{{.i18n.Tr "org.teams.can_create_org_repo"}}
43+
{{end}}
44+
</ul>
45+
{{if (eq .Team.AccessMode 2)}}
46+
<h3>{{.i18n.Tr "org.settings.permission"}}</h3>
47+
{{.i18n.Tr "org.teams.write_permission_desc"}}
48+
{{else if (eq .Team.AccessMode 3)}}
49+
<h3>{{.i18n.Tr "org.settings.permission"}}</h3>
50+
{{.i18n.Tr "org.teams.admin_permission_desc"}}
4151
{{else}}
42-
{{.i18n.Tr "org.teams.write_permission_desc" | Str2html}}
52+
<table class="ui table">
53+
<thead>
54+
<tr>
55+
<th>{{.i18n.Tr "units.unit"}}</th>
56+
<th>{{.i18n.Tr "org.team_permission_desc"}}</th>
57+
</tr>
58+
</thead>
59+
<tbody>
60+
{{range $t, $unit := $.Units}}
61+
{{if and (lt $unit.MaxPerm 2) (not $unit.Type.UnitGlobalDisabled)}}
62+
<tr>
63+
<td><strong>{{$.i18n.Tr $unit.NameKey}}</strong></td>
64+
<td>{{if eq ($.Team.UnitAccessMode $unit.Type) 0 -}}
65+
{{$.i18n.Tr "org.teams.none_access"}}
66+
{{- else if or (eq $.Team.ID 0) (eq ($.Team.UnitAccessMode $unit.Type) 1) -}}
67+
{{$.i18n.Tr "org.teams.read_access"}}
68+
{{- else if eq ($.Team.UnitAccessMode $unit.Type) 2 -}}
69+
{{$.i18n.Tr "org.teams.write_access"}}
70+
{{- end}}</td>
71+
</tr>
72+
{{end}}
73+
{{end}}
74+
</tbody>
75+
</table>
4376
{{end}}
44-
{{else if (eq .Team.AccessMode 3)}}
45-
{{if .Team.IncludesAllRepositories}}
46-
{{.i18n.Tr "org.teams.all_repositories_admin_permission_desc" | Str2html}}
47-
{{else}}
48-
{{.i18n.Tr "org.teams.admin_permission_desc" | Str2html}}
49-
{{end}}
50-
{{end}}
51-
{{if .Team.CanCreateOrgRepo}}
52-
<br><br>{{.i18n.Tr "org.teams.create_repo_permission_desc" | Str2html}}
5377
{{end}}
5478
</div>
5579
</div>

0 commit comments

Comments
 (0)