aboutsummaryrefslogtreecommitdiff
path: root/routers/user/user.go
diff options
context:
space:
mode:
authorUnknown <joe2010xtmf@163.com>2014-03-15 00:50:51 -0400
committerUnknown <joe2010xtmf@163.com>2014-03-15 00:50:51 -0400
commitadb17791bdb94d22cdc571d7f633846c6fe3d938 (patch)
tree8d9f9ffa487e63874e21d42ee3cc8c4a6c3dc85a /routers/user/user.go
parent2289ff20bf40e2adaa096aeac80837c69c2f01c3 (diff)
Add basic render of public act
Diffstat (limited to 'routers/user/user.go')
-rw-r--r--routers/user/user.go8
1 files changed, 7 insertions, 1 deletions
diff --git a/routers/user/user.go b/routers/user/user.go
index 6095b538..4dd9abe5 100644
--- a/routers/user/user.go
+++ b/routers/user/user.go
@@ -40,6 +40,12 @@ func Profile(params martini.Params, r render.Render, data base.TmplData, session
}
data["Owner"] = user
+ feeds, err := models.GetFeeds(user.Id, 0, true)
+ if err != nil {
+ log.Handle(200, "user.Profile", data, r, err)
+ return
+ }
+ data["Feeds"] = feeds
r.HTML(200, "user/profile", data)
}
@@ -156,7 +162,7 @@ func Delete(data base.TmplData, req *http.Request, session sessions.Session, r r
}
func Feeds(form auth.FeedsForm, r render.Render) {
- actions, err := models.GetFeeds(form.UserId, form.Offset)
+ actions, err := models.GetFeeds(form.UserId, form.Offset, false)
if err != nil {
r.JSON(500, err)
}