Fix org members bug (#20489)

* Fix bug in public only org members list

bug was introduced in d6779c7ad3

* Expanded org unit test

diff --git a/integrations/org_test.go b/integrations/org_test.go
index d755385726a5501f0c2d905bbe54ee99762f236e..d787e6f79100d03dbdf14c6c372503035226f92d 100644 (file)
--- 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 9a2c235aa6b297b95ed868f4e6d3446ae5b1931b..b558dbe5ee03b82a46a47dcb6b37f9ce8ca76dd4 100644 (file)
--- 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"}}