Browse Source

Fix org members bug (#20489)

* Fix bug in public only org members list

bug was introduced in d6779c7ad3

* Expanded org unit test
tags/v1.18.0-rc0
Vladimir Yakovlev 1 year ago
parent
commit
5ed082b624
No account linked to committer's email address
2 changed files with 19 additions and 1 deletions
  1. 18
    0
      integrations/org_test.go
  2. 1
    1
      templates/org/member/members.tmpl

+ 18
- 0
integrations/org_test.go View File

@@ -116,6 +116,24 @@ func TestPrivateOrg(t *testing.T) {
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) {
defer prepareTestEnv(t)()


+ 1
- 1
templates/org/member/members.tmpl View File

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

Loading…
Cancel
Save