mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-09-08 00:03:28 +00:00
Fix SQL condition bug in GetFeeds(..) (#2360)
This commit is contained in:
parent
9413b48a0b
commit
fd6e91077a
1 changed files with 5 additions and 4 deletions
|
@ -733,12 +733,13 @@ func GetFeeds(opts GetFeedsOptions) ([]*Action, error) {
|
||||||
cond = cond.And(builder.In("repo_id", repoIDs))
|
cond = cond.And(builder.In("repo_id", repoIDs))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var userIDCond builder.Cond = builder.Eq{"user_id": opts.RequestedUser.ID}
|
||||||
if opts.Collaborate {
|
if opts.Collaborate {
|
||||||
cond = builder.Eq{"user_id": opts.RequestedUser.ID}.Or(
|
userIDCond = userIDCond.Or(builder.Expr(
|
||||||
builder.Expr(`repo_id IN (SELECT repo_id FROM "access" WHERE access.user_id = ?)`, opts.RequestedUser.ID))
|
`repo_id IN (SELECT repo_id FROM "access" WHERE access.user_id = ?)`,
|
||||||
} else {
|
opts.RequestedUser.ID))
|
||||||
cond = builder.Eq{"user_id": opts.RequestedUser.ID}
|
|
||||||
}
|
}
|
||||||
|
cond = cond.And(userIDCond)
|
||||||
|
|
||||||
if opts.OnlyPerformedBy {
|
if opts.OnlyPerformedBy {
|
||||||
cond = cond.And(builder.Eq{"act_user_id": opts.RequestedUser.ID})
|
cond = cond.And(builder.Eq{"act_user_id": opts.RequestedUser.ID})
|
||||||
|
|
Loading…
Reference in a new issue