MirrorHub/gitea
0
0
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2024-12-22 16:54:15 +01:00
Code Issues Releases Wiki Activity

fix duplicated feed (#2370)

Browse source
This commit is contained in:
Lunny Xiao 2017-08-28 10:26:04 +08:00 committed by GitHub
parent 0f2c98adcd
commit e41da3845d
3 changed files with 1 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
models/action.go
View file

@ -713,7 +713,6 @@ type GetFeedsOptions struct {
IncludePrivate bool // include private actions IncludePrivate bool // include private actions
OnlyPerformedBy bool // only actions performed by requested user OnlyPerformedBy bool // only actions performed by requested user
IncludeDeleted bool // include deleted actions IncludeDeleted bool // include deleted actions
Collaborate bool // Include collaborative repositories
} }
// GetFeeds returns actions according to the provided options // GetFeeds returns actions according to the provided options
@ -733,13 +732,7 @@ 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} cond = cond.And(builder.Eq{"user_id": opts.RequestedUser.ID})
if opts.Collaborate {
userIDCond = userIDCond.Or(builder.Expr(
"repo_id IN (SELECT repo_id FROM `access` WHERE access.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})

1
routers/user/home.go
View file

@ -156,7 +156,6 @@ func Dashboard(ctx *context.Context) {
retrieveFeeds(ctx, models.GetFeedsOptions{RequestedUser: ctxUser, retrieveFeeds(ctx, models.GetFeedsOptions{RequestedUser: ctxUser,
IncludePrivate: true, IncludePrivate: true,
OnlyPerformedBy: false, OnlyPerformedBy: false,
Collaborate: true,
IncludeDeleted: false, IncludeDeleted: false,
}) })
if ctx.Written() { if ctx.Written() {

1
routers/user/profile.go
View file

@ -141,7 +141,6 @@ func Profile(ctx *context.Context) {
retrieveFeeds(ctx, models.GetFeedsOptions{RequestedUser: ctxUser, retrieveFeeds(ctx, models.GetFeedsOptions{RequestedUser: ctxUser,
IncludePrivate: showPrivate, IncludePrivate: showPrivate,
OnlyPerformedBy: true, OnlyPerformedBy: true,
Collaborate: true,
IncludeDeleted: false, IncludeDeleted: false,
}) })
if ctx.Written() { if ctx.Written() {