summaryrefslogtreecommitdiffstats
path: root/routers/user
diff options
context:
space:
mode:
authorFlorian Kaiser <florian.kaiser@fnkr.net>2016-02-06 07:52:21 +0000
committerFlorian Kaiser <florian.kaiser@fnkr.net>2016-02-06 07:52:21 +0000
commit45db167f7a80f777db403decf9532bc9a6c9d43e (patch)
tree6950bbc21c8b607c4bfeb35754f5ce52d9fa0483 /routers/user
parent90e9e3c89d01c58b68c71f47249a6190c04797a0 (diff)
downloadgitea-45db167f7a80f777db403decf9532bc9a6c9d43e.tar.gz
gitea-45db167f7a80f777db403decf9532bc9a6c9d43e.zip
Only show activities for repositories on dashboard, that the user has access to
Diffstat (limited to 'routers/user')
-rw-r--r--routers/user/home.go6
-rw-r--r--routers/user/profile.go2
2 files changed, 4 insertions, 4 deletions
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
}