lay down UserList bases

models/user.go

@@ -142,7 +142,7 @@ type User struct {
 	NumTeams   int
 	NumMembers int
 	Teams      []*Team             `xorm:"-"`
-	Members    []*User             `xorm:"-"`
+	Members    UserList            `xorm:"-"`
 	Visibility structs.VisibleType `xorm:"NOT NULL DEFAULT 0"`
 
 	// Preferences

models/userlist.go

@@ -0,0 +1,39 @@
+// Copyright 2019 The Gitea Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package models
+
+type UserList []*User
+
+//TODO paginate
+
+// IsPublicMember returns true if user public his/her membership in given organization.
+func (ul UserList) IsPublicMember(orgID int64) []bool {
+	results := make([]bool, len(ul))
+	//TODO use directly xorm
+	for i, u := range ul {
+		results[i] = u.IsPublicMember(orgID)
+	}
+	return results
+}
+
+// IsUserOrgOwner returns true if user is in the owner team of given organization.
+func (ul UserList) IsUserOrgOwner(orgID int64) []bool {
+	results := make([]bool, len(ul))
+	//TODO use directly xorm
+	for i, u := range ul {
+		results[i] = u.IsUserOrgOwner(orgID)
+	}
+	return results
+}
+
+// IsTwoFaEnrolled return state of 2FA enrollement
+func (ul UserList) IsTwoFaEnrolled() []bool {
+	results := make([]bool, len(ul))
+	//TODO use directly xorm
+	for i, u := range ul {
+		results[i] = u.IsTwoFaEnrolled()
+	}
+	return results
+}

routers/org/members.go

@@ -30,6 +30,9 @@ func Members(ctx *context.Context) {
 		return
 	}
 	ctx.Data["Members"] = org.Members
+	ctx.Data["MembersIsPublicMember"] = org.Members.IsPublicMember(org.ID)
+	ctx.Data["MembersIsUserOrgOwner"] = org.Members.IsUserOrgOwner(org.ID)
+	ctx.Data["MembersIsTwoFaEnrolled"] = org.Members.IsTwoFaEnrolled()
 
 	ctx.HTML(200, tplMembers)
 }

templates/org/member/members.tmpl

@@ -5,7 +5,7 @@
 		{{template "base/alert" .}}
 
 		<div class="list">
-			{{range .Members}}
+			{{ range $id, $member := .Members}}
 				<div class="item ui grid">
 					<div class="ui one wide column">
 						<img class="ui avatar" src="{{.SizedRelAvatarLink 48}}">
@@ -19,7 +19,7 @@
 							{{$.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,15 +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 .IsTwoFaEnrolled}}octicon-check text green{{else}}octicon-x{{end}}"></span></strong>
+							<strong><span class="octicon {{if index $.MembersIsTwoFaEnrolled $id}}octicon-check text green{{else}}octicon-x{{end}}"></span></strong>
 						</div>
 					</div>
 					<div class="ui four wide column">