third_party
/
gitea
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix public org members displayed too many informations (#20403)

Browse Source
tokarchuk/v1.18
Lunny Xiao 2 years ago committed by GitHub
parent 4c7e51ee3a
commit d6779c7ad3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 20 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      routers/web/org/members.go
  2. 42
      templates/org/member/members.tmpl

1
routers/web/org/members.go
Unescape View File

@ -45,6 +45,7 @@ func Members(ctx *context.Context) {
} }
opts.PublicOnly = !isMember && !ctx.Doer.IsAdmin opts.PublicOnly = !isMember && !ctx.Doer.IsAdmin
} }
ctx.Data["PublicOnly"] = opts.PublicOnly
total, err := organization.CountOrgMembers(opts) total, err := organization.CountOrgMembers(opts)
if err != nil { if err != nil {

42
templates/org/member/members.tmpl
Unescape View File

@ -29,28 +29,30 @@
{{end}} {{end}}
</div> </div>
</div> </div>
<div class="ui three wide column center"> {{if not .PublicOnly}}
<div class="meta"> <div class="ui three wide column center">
{{$.locale.Tr "org.members.member_role"}} <div class="meta">
</div> {{$.locale.Tr "org.members.member_role"}}
<div class="meta"> </div>
<strong>{{if index $.MembersIsUserOrgOwner .ID}}{{svg "octicon-shield-lock"}} {{$.locale.Tr "org.members.owner"}}{{else}}{{$.locale.Tr "org.members.member"}}{{end}}</strong> <div class="meta">
</div> <strong>{{if index $.MembersIsUserOrgOwner .ID}}{{svg "octicon-shield-lock"}} {{$.locale.Tr "org.members.owner"}}{{else}}{{$.locale.Tr "org.members.member"}}{{end}}</strong>
</div> </div>
<div class="ui two wide column center">
<div class="meta">
{{$.locale.Tr "admin.users.2fa"}}
</div> </div>
<div class="meta"> <div class="ui two wide column center">
<strong> <div class="meta">
{{if index $.MembersTwoFaStatus .ID}} {{$.locale.Tr "admin.users.2fa"}}
<span class="text green">{{svg "octicon-check"}}</span> </div>
{{else}} <div class="meta">
{{svg "octicon-x"}} <strong>
{{end}} {{if index $.MembersTwoFaStatus .ID}}
</strong> <span class="text green">{{svg "octicon-check"}}</span>
{{else}}
{{svg "octicon-x"}}
{{end}}
</strong>
</div>
</div> </div>
</div> {{end}}
<div class="ui three wide column"> <div class="ui three wide column">
<div class="text right"> <div class="text right">
{{if eq $.SignedUser.ID .ID}} {{if eq $.SignedUser.ID .ID}}

Write Preview
Loading…
Cancel
Save