Skip to content

Commit b997b21

Browse files
committed
fix team display
1 parent f788a8d commit b997b21

File tree

2 files changed

+23
-3
lines changed

2 files changed

+23
-3
lines changed

options/locale/locale_en-US.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2163,6 +2163,7 @@ settings.collaboration.write = Write
21632163
settings.collaboration.read = Read
21642164
settings.collaboration.owner = Owner
21652165
settings.collaboration.undefined = Undefined
2166+
settings.collaboration.per_unit = Unit Permissions
21662167
settings.hooks = Webhooks
21672168
settings.githooks = Git Hooks
21682169
settings.basic_settings = Basic Settings

templates/repo/settings/collaboration.tmpl

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,31 @@
6464
</a>
6565
<div class="flex-item-body flex-text-block">
6666
{{svg "octicon-shield-lock"}}
67-
{{if eq .AccessMode 1}}{{ctx.Locale.Tr "repo.settings.collaboration.read"}}{{else if eq .AccessMode 2}}{{ctx.Locale.Tr "repo.settings.collaboration.write"}}{{else if eq .AccessMode 3}}{{ctx.Locale.Tr "repo.settings.collaboration.admin"}}{{else if eq .AccessMode 4}}{{ctx.Locale.Tr "repo.settings.collaboration.owner"}}{{else}}{{ctx.Locale.Tr "repo.settings.collaboration.undefined"}}{{end}}
67+
{{if eq .AccessMode 0}}
68+
{{ctx.Locale.Tr "repo.settings.collaboration.per_unit"}}
69+
{{else if eq .AccessMode 1}}
70+
{{ctx.Locale.Tr "repo.settings.collaboration.read"}}
71+
{{else if eq .AccessMode 2}}
72+
{{ctx.Locale.Tr "repo.settings.collaboration.write"}}
73+
{{else if eq .AccessMode 3}}
74+
{{ctx.Locale.Tr "repo.settings.collaboration.admin"}}
75+
{{else if eq .AccessMode 4}}
76+
{{ctx.Locale.Tr "repo.settings.collaboration.owner"}}
77+
{{else}}
78+
{{ctx.Locale.Tr "repo.settings.collaboration.undefined"}}
79+
{{end}}
6880
</div>
69-
{{if or (eq .AccessMode 1) (eq .AccessMode 2)}}
81+
{{if or (eq .AccessMode 0) (eq .AccessMode 1) (eq .AccessMode 2)}}
7082
{{$first := true}}
7183
<div class="flex-item-body" data-tooltip-content="{{ctx.Locale.Tr "repo.settings.change_team_permission_tip"}}">
72-
Sections: {{range $u, $unit := $.Units}}{{if and ($.Repo.UnitEnabled ctx $unit.Type) ($team.UnitEnabled ctx $unit.Type)}}{{if $first}}{{$first = false}}{{else}}, {{end}}{{ctx.Locale.Tr $unit.NameKey}}{{end}}{{end}} {{if $first}}None{{end}}
84+
Units:
85+
{{range $u, $unit := $.Units}}
86+
{{- if and ($.Repo.UnitEnabled ctx $unit.Type) ($team.UnitEnabled ctx $unit.Type) -}}
87+
{{- Iif $first "" ", "}}{{ctx.Locale.Tr $unit.NameKey -}}
88+
{{- $first = false -}}
89+
{{- end -}}
90+
{{end}}
91+
{{if $first}}None{{end}}
7392
</div>
7493
{{end}}
7594
</div>

0 commit comments

Comments
 (0)