From 2db0ffe69ef80def358b96ff2c3804c79c9174c3 Mon Sep 17 00:00:00 2001
From: Bo-Yi Wu <appleboy.tw@gmail.com>
Date: Thu, 2 Feb 2017 20:32:40 +0800
Subject: [PATCH] fix: User can see the private activity on public activity
history. (#818)
---
routers/user/profile.go | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/routers/user/profile.go b/routers/user/profile.go
index f72ced7b3c..857b9e3f5b 100644
--- a/routers/user/profile.go
+++ b/routers/user/profile.go
@@ -78,8 +78,9 @@ func Profile(ctx *context.Context) {
ctx.Data["Title"] = ctxUser.DisplayName()
ctx.Data["PageIsUserProfile"] = true
ctx.Data["Owner"] = ctxUser
+ showPrivate := ctx.IsSigned && (ctx.User.IsAdmin || ctx.User.ID == ctxUser.ID)
- orgs, err := models.GetOrgsByUserID(ctxUser.ID, ctx.IsSigned && (ctx.User.IsAdmin || ctx.User.ID == ctxUser.ID))
+ orgs, err := models.GetOrgsByUserID(ctxUser.ID, showPrivate)
if err != nil {
ctx.Handle(500, "GetOrgsByUserIDDesc", err)
return
@@ -91,13 +92,12 @@ func Profile(ctx *context.Context) {
ctx.Data["TabName"] = tab
switch tab {
case "activity":
- retrieveFeeds(ctx, ctxUser, -1, 0, true)
+ retrieveFeeds(ctx, ctxUser, -1, 0, !showPrivate)
if ctx.Written() {
return
}
case "stars":
- showPrivateRepos := ctx.IsSigned && ctx.User.ID == ctxUser.ID
- starredRepos, err := ctxUser.GetStarredRepos(showPrivateRepos)
+ starredRepos, err := ctxUser.GetStarredRepos(showPrivate)
if err != nil {
ctx.Handle(500, "GetStarredRepos", err)
return
@@ -109,7 +109,7 @@ func Profile(ctx *context.Context) {
page = 1
}
- ctx.Data["Repos"], err = models.GetUserRepositories(ctxUser.ID, ctx.IsSigned && ctx.User.ID == ctxUser.ID, page, setting.UI.User.RepoPagingNum)
+ ctx.Data["Repos"], err = models.GetUserRepositories(ctxUser.ID, showPrivate, page, setting.UI.User.RepoPagingNum)
if err != nil {
ctx.Handle(500, "GetRepositories", err)
return