From 39fb404a6b0cc833ea92ea7ee9a5920722b4bda7 Mon Sep 17 00:00:00 2001
From: Vladimir Yakovlev <nagos@inbox.ru>
Date: Tue, 26 Jul 2022 11:31:07 +0300
Subject: [PATCH 1/2] Fix bug in public only org members list

bug was introduced in d6779c7ad3
---
 templates/org/member/members.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/org/member/members.tmpl b/templates/org/member/members.tmpl
index 9a2c235aa6b29..b558dbe5ee03b 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"}}

From f48b7fddc11d924000b037704bcc4e8648f0caa6 Mon Sep 17 00:00:00 2001
From: Vladimir Yakovlev <nagos@inbox.ru>
Date: Tue, 26 Jul 2022 15:49:23 +0300
Subject: [PATCH 2/2] Expanded org unit test

---
 integrations/org_test.go | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/integrations/org_test.go b/integrations/org_test.go
index d755385726a55..d787e6f79100d 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)()