]> source.dussan.org Git - gitea.git/commitdiff
fix #139
authorUnknwon <joe2010xtmf@163.com>
Fri, 21 Nov 2014 16:08:24 +0000 (11:08 -0500)
committerUnknwon <joe2010xtmf@163.com>
Fri, 21 Nov 2014 16:08:24 +0000 (11:08 -0500)
routers/user/home.go

index 1bb9701104ad6b7310df8d302fdba292b3d1aa6d..ea669959e4e7280fc8286b67067b1c4d22b8d710 100644 (file)
@@ -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 {