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

Fix org members bug (#20489)

Browse source 
* Fix bug in public only org members list

bug was introduced in d6779c7ad3

* Expanded org unit test
This commit is contained in:
Vladimir Yakovlev 2022-07-26 19:13:24 +03:00 committed by GitHub
parent a701fd35cf
commit 5ed082b624
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
integrations/org_test.go
View file

@ -116,6 +116,24 @@ func TestPrivateOrg(t *testing.T) {
session.MakeRequest(t, req, http.StatusOK) session.MakeRequest(t, req, http.StatusOK)
} }
func TestOrgMembers(t *testing.T) {
defer prepareTestEnv(t)()
// not logged in user
req := NewRequest(t, "GET", "/org/org25/members")
MakeRequest(t, req, http.StatusOK)
// org member
session := loginUser(t, "user24")
req = NewRequest(t, "GET", "/org/org25/members")
session.MakeRequest(t, req, http.StatusOK)
// site admin
session = loginUser(t, "user1")
req = NewRequest(t, "GET", "/org/org25/members")
session.MakeRequest(t, req, http.StatusOK)
}
func TestOrgRestrictedUser(t *testing.T) { func TestOrgRestrictedUser(t *testing.T) {
defer prepareTestEnv(t)() defer prepareTestEnv(t)()

2
templates/org/member/members.tmpl
View file

@ -29,7 +29,7 @@
{{end}} {{end}}
</div> </div>
</div> </div>
{{if not .PublicOnly}} {{if not $.PublicOnly}}
<div class="ui three wide column center"> <div class="ui three wide column center">
<div class="meta"> <div class="meta">
{{$.locale.Tr "org.members.member_role"}} {{$.locale.Tr "org.members.member_role"}}