TudbuT/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Slight simplification of accessibleRepositoryCondition (#10875)

Browse source 
* Slight simplification of accessibleRepositoryCondition

Signed-off-by: Andrew Thornton <art27@cantab.net>
This commit is contained in:
zeripath 2020-03-29 15:31:10 +01:00 • committed by GitHub
parent ad4026431b
commit 209045f55b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
models/repo_list.go
View file

@ -353,11 +353,12 @@ func accessibleRepositoryCondition(user *User) builder.Cond {
// 1. Be able to see all non-private repositories that either: // 1. Be able to see all non-private repositories that either:
cond = cond.Or(builder.And( cond = cond.Or(builder.And(
builder.Eq{"`repository`.is_private": false}, builder.Eq{"`repository`.is_private": false},
builder.Or( // 2. Aren't in an private organisation or limited organisation if we're not logged in
// A. Aren't in organisations __OR__ builder.NotIn("`repository`.owner_id", builder.Select("id").From("`user`").Where(
builder.NotIn("`repository`.owner_id", builder.Select("id").From("`user`").Where(builder.Eq{"type": UserTypeOrganization})), builder.And(
// B. Isn't a private organisation. Limited is OK as long as we're logged in. builder.Eq{"type": UserTypeOrganization},
builder.NotIn("`repository`.owner_id", builder.Select("id").From("`user`").Where(builder.In("visibility", orgVisibilityLimit)))))) builder.In("visibility", orgVisibilityLimit)),
))))
} }
if user != nil { if user != nil {