From 209045f55b1cfdb6e52fa7a67078c1a4edb1cf4f Mon Sep 17 00:00:00 2001 From: zeripath Date: Sun, 29 Mar 2020 15:31:10 +0100 Subject: [PATCH] Slight simplification of accessibleRepositoryCondition (#10875) * Slight simplification of accessibleRepositoryCondition Signed-off-by: Andrew Thornton --- models/repo_list.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/models/repo_list.go b/models/repo_list.go index 9c5597ee0..7ceb88f08 100644 --- a/models/repo_list.go +++ b/models/repo_list.go @@ -353,11 +353,12 @@ func accessibleRepositoryCondition(user *User) builder.Cond { // 1. Be able to see all non-private repositories that either: cond = cond.Or(builder.And( builder.Eq{"`repository`.is_private": false}, - builder.Or( - // A. Aren't in organisations __OR__ - builder.NotIn("`repository`.owner_id", builder.Select("id").From("`user`").Where(builder.Eq{"type": UserTypeOrganization})), - // B. Isn't a private organisation. Limited is OK as long as we're logged in. - builder.NotIn("`repository`.owner_id", builder.Select("id").From("`user`").Where(builder.In("visibility", orgVisibilityLimit)))))) + // 2. Aren't in an private organisation or limited organisation if we're not logged in + builder.NotIn("`repository`.owner_id", builder.Select("id").From("`user`").Where( + builder.And( + builder.Eq{"type": UserTypeOrganization}, + builder.In("visibility", orgVisibilityLimit)), + )))) } if user != nil {