diff options
| author | Antoine GIRARD <sapk@users.noreply.github.com> | 2019-08-02 18:06:28 +0200 |
|---|---|---|
| committer | techknowlogick <techknowlogick@gitea.io> | 2019-08-02 12:06:27 -0400 |
| commit | 76408d50fb338e9239ee06bb26eec28453167300 (patch) | |
| tree | 552f49cb095e9744c11f71dba9a3910a7d0ceb18 /templates/org | |
| parent | 3566d2c860b0ad3ab7d6d5fb1490eb9a5b5f5974 (diff) | |
| download | gitea-76408d50fb338e9239ee06bb26eec28453167300.tar.gz gitea-76408d50fb338e9239ee06bb26eec28453167300.zip | |
org/members: display 2FA members states + optimize sql requests (#7621)
* org/members: display 2FA state
* fix comment typo
* lay down UserList bases
* add basic test for previous methods
* add comment for UserList type
* add valid two-fa account
* test new UserList methods
* optimize MembersIsPublic by side loading info on GetMembers + fix integrations tests
* respect fmt rules
* use map for data
* Optimize GetTwoFaStatus
* rewrite by using existing sub func
* Optimize IsUserOrgOwner
* remove un-used code
* tests: cover empty org + fix import order
* tests: add ErrTeamNotExist path
* tests: fix wrong expected result
Diffstat (limited to 'templates/org')
| -rw-r--r-- | templates/org/member/members.tmpl | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/templates/org/member/members.tmpl b/templates/org/member/members.tmpl index 7f0a763610..9db506ee5b 100644 --- a/templates/org/member/members.tmpl +++ b/templates/org/member/members.tmpl @@ -5,7 +5,7 @@ {{template "base/alert" .}} <div class="list"> - {{range .Members}} + {{ range .Members}} <div class="item ui grid"> <div class="ui one wide column"> <img class="ui avatar" src="{{.SizedRelAvatarLink 48}}"> @@ -14,12 +14,12 @@ <div class="meta"><a href="{{.HomeLink}}">{{.Name}}</a></div> <div class="meta">{{.FullName}}</div> </div> - <div class="ui five wide column center"> + <div class="ui four wide column center"> <div class="meta"> {{$.i18n.Tr "org.members.membership_visibility"}} </div> <div class="meta"> - {{ $isPublic := .IsPublicMember $.Org.ID}} + {{ $isPublic := index $.MembersIsPublicMember .ID}} {{if $isPublic}} <strong>{{$.i18n.Tr "org.members.public"}}</strong> {{if or (eq $.SignedUser.ID .ID) $.IsOrganizationOwner}}(<a href="{{$.OrgLink}}/members/action/private?uid={{.ID}}">{{$.i18n.Tr "org.members.public_helper"}}</a>){{end}} @@ -34,7 +34,15 @@ {{$.i18n.Tr "org.members.member_role"}} </div> <div class="meta"> - <strong>{{if .IsUserOrgOwner $.Org.ID}}<span class="octicon octicon-shield"></span> {{$.i18n.Tr "org.members.owner"}}{{else}}{{$.i18n.Tr "org.members.member"}}{{end}}</strong> + <strong>{{if index $.MembersIsUserOrgOwner .ID}}<span class="octicon octicon-shield"></span> {{$.i18n.Tr "org.members.owner"}}{{else}}{{$.i18n.Tr "org.members.member"}}{{end}}</strong> + </div> + </div> + <div class="ui one wide column center"> + <div class="meta"> + 2FA + </div> + <div class="meta"> + <strong><span class="octicon {{if index $.MembersTwoFaStatus .ID}}octicon-check text green{{else}}octicon-x{{end}}"></span></strong> </div> </div> <div class="ui four wide column"> |