From 45db167f7a80f777db403decf9532bc9a6c9d43e Mon Sep 17 00:00:00 2001 From: Florian Kaiser Date: Sat, 6 Feb 2016 07:52:21 +0000 Subject: Only show activities for repositories on dashboard, that the user has access to --- routers/user/home.go | 6 +++--- routers/user/profile.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'routers') diff --git a/routers/user/home.go b/routers/user/home.go index e1f942df8f..d48f28316e 100644 --- a/routers/user/home.go +++ b/routers/user/home.go @@ -51,8 +51,8 @@ func getDashboardContextUser(ctx *middleware.Context) *models.User { return ctxUser } -func retrieveFeeds(ctx *middleware.Context, uid, offset int64, isProfile bool) { - actions, err := models.GetFeeds(uid, offset, isProfile) +func retrieveFeeds(ctx *middleware.Context, ctxUserID, userID, offset int64, isProfile bool) { + actions, err := models.GetFeeds(ctxUserID, userID, offset, isProfile) if err != nil { ctx.Handle(500, "GetFeeds", err) return @@ -140,7 +140,7 @@ func Dashboard(ctx *middleware.Context) { ctx.Data["MirrorCount"] = len(mirrors) ctx.Data["Mirrors"] = mirrors - retrieveFeeds(ctx, ctxUser.Id, 0, false) + retrieveFeeds(ctx, ctx.User.Id, ctxUser.Id, 0, false) if ctx.Written() { return } diff --git a/routers/user/profile.go b/routers/user/profile.go index 0a876610ed..c1ebc3bf83 100644 --- a/routers/user/profile.go +++ b/routers/user/profile.go @@ -86,7 +86,7 @@ func Profile(ctx *middleware.Context) { ctx.Data["TabName"] = tab switch tab { case "activity": - retrieveFeeds(ctx, u.Id, 0, true) + retrieveFeeds(ctx, -1, u.Id, 0, true) if ctx.Written() { return } -- cgit v1.2.3