summaryrefslogtreecommitdiffstats
path: root/routers
diff options
context:
space:
mode:
authorUnknwon <joe2010xtmf@163.com>2014-11-21 11:08:24 -0500
committerUnknwon <joe2010xtmf@163.com>2014-11-21 11:08:24 -0500
commit22ab4fa1b0bdbea10979ae87568452b5bbf9b6af (patch)
tree4ff35388824ce5a18b7c0b681b77913f2a30f794 /routers
parent55dfe2c97876a8af5db0fb071f002e33fb686128 (diff)
downloadgitea-22ab4fa1b0bdbea10979ae87568452b5bbf9b6af.tar.gz
gitea-22ab4fa1b0bdbea10979ae87568452b5bbf9b6af.zip
fix #139
Diffstat (limited to 'routers')
-rw-r--r--routers/user/home.go14
1 files changed, 13 insertions, 1 deletions
diff --git a/routers/user/home.go b/routers/user/home.go
index 1bb9701104..ea669959e4 100644
--- a/routers/user/home.go
+++ b/routers/user/home.go
@@ -163,11 +163,23 @@ func Profile(ctx *middleware.Context) {
ctx.Data["TabName"] = tab
switch tab {
case "activity":
- ctx.Data["Feeds"], err = models.GetFeeds(u.Id, 0, true)
+ actions, err := models.GetFeeds(u.Id, 0, false)
if err != nil {
ctx.Handle(500, "GetFeeds", err)
return
}
+ feeds := make([]*models.Action, 0, len(actions))
+ for _, act := range actions {
+ // FIXME: cache results?
+ u, err := models.GetUserByName(act.ActUserName)
+ if err != nil {
+ ctx.Handle(500, "GetUserByName", err)
+ return
+ }
+ act.ActAvatar = u.AvatarLink()
+ feeds = append(feeds, act)
+ }
+ ctx.Data["Feeds"] = feeds
default:
ctx.Data["Repos"], err = models.GetRepositories(u.Id, ctx.IsSigned && ctx.User.Id == u.Id)
if err != nil {