finn/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

org/members: display 2FA members states + optimize sql requests (#7621)

Browse source 
* 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
This commit is contained in:
Antoine GIRARD 2019-08-02 18:06:28 +02:00 • committed by techknowlogick
parent 3566d2c860
commit 76408d50fb
13 changed files with 346 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

7
routers/org/members.go
View file

@ -19,7 +19,7 @@ const (
tplMembers base.TplName = "org/member/members"
)
// Members render orgnization users page
// Members render organization users page
func Members(ctx *context.Context) {
org := ctx.Org.Organization
ctx.Data["Title"] = org.FullName
@ -30,11 +30,14 @@ func Members(ctx *context.Context) {
return
}
ctx.Data["Members"] = org.Members
ctx.Data["MembersIsPublicMember"] = org.MembersIsPublic
ctx.Data["MembersIsUserOrgOwner"] = org.Members.IsUserOrgOwner(org.ID)
ctx.Data["MembersTwoFaStatus"] = org.Members.GetTwoFaStatus()
ctx.HTML(200, tplMembers)
}
// MembersAction response for operation to a member of orgnization
// MembersAction response for operation to a member of organization
func MembersAction(ctx *context.Context) {
uid := com.StrTo(ctx.Query("uid")).MustInt64()
if uid == 0 {