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

IntegraSDL · Aug 10, 2022 · ed55dfe · ed55dfe
1 parent eb81444
commit ed55dfe
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 20 deletions.
diff --git a/routers/web/org/members.go b/routers/web/org/members.go
@@ -45,6 +45,7 @@ func Members(ctx *context.Context) {
  }
  opts.PublicOnly = !isMember && !ctx.Doer.IsAdmin
  }
+ ctx.Data["PublicOnly"] = opts.PublicOnly
 
  total, err := organization.CountOrgMembers(opts)
  if err != nil {

diff --git a/templates/org/member/members.tmpl b/templates/org/member/members.tmpl
@@ -29,28 +29,30 @@
  {{end}}
  </div>
  </div>
- <div class="ui three wide column center">
- <div class="meta">
- {{$.locale.Tr "org.members.member_role"}}
- </div>
- <div class="meta">
- <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"}}
+ {{if not .PublicOnly}}
+ <div class="ui three wide column center">
+ <div class="meta">
+ {{$.locale.Tr "org.members.member_role"}}
+ </div>
+ <div class="meta">
+ <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="meta">
- <strong>
- {{if index $.MembersTwoFaStatus .ID}}
- <span class="text green">{{svg "octicon-check"}}</span>
- {{else}}
- {{svg "octicon-x"}}
- {{end}}
- </strong>
+ <div class="ui two wide column center">
+ <div class="meta">
+ {{$.locale.Tr "admin.users.2fa"}}
+ </div>
+ <div class="meta">
+ <strong>
+ {{if index $.MembersTwoFaStatus .ID}}
+ <span class="text green">{{svg "octicon-check"}}</span>
+ {{else}}
+ {{svg "octicon-x"}}
+ {{end}}
+ </strong>
+ </div>
  </div>
- </div>
+ {{end}}
  <div class="ui three wide column">
  <div class="text right">
  {{if eq $.SignedUser.ID .ID}}