From 5ed082b62491f17c6c91e21f8fe7d544559b0ea1 Mon Sep 17 00:00:00 2001
From: Vladimir Yakovlev <nagos@inbox.ru>
Date: Tue, 26 Jul 2022 19:13:24 +0300
Subject: [PATCH] Fix org members bug (#20489)
* Fix bug in public only org members list
bug was introduced in d6779c7ad3
* Expanded org unit test
---
integrations/org_test.go | 18 ++++++++++++++++++
templates/org/member/members.tmpl | 2 +-
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/integrations/org_test.go b/integrations/org_test.go
index d755385726..d787e6f791 100644
--- a/integrations/org_test.go
+++ b/integrations/org_test.go
@@ -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)()
diff --git a/templates/org/member/members.tmpl b/templates/org/member/members.tmpl
index 9a2c235aa6..b558dbe5ee 100644
--- a/templates/org/member/members.tmpl
+++ b/templates/org/member/members.tmpl
@@ -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"}}