summaryrefslogtreecommitdiffstats
path: root/routers
diff options
context:
space:
mode:
authorUnknown <joe2010xtmf@163.com>2014-03-29 07:50:25 -0400
committerUnknown <joe2010xtmf@163.com>2014-03-29 07:50:25 -0400
commit828282882066aa4e8bd8fb0c083c530607bc34bb (patch)
tree4ac056c6d088a046d5b848c872c363cd6bc0276b /routers
parent879ef8d81fa7dd194a7482c870cecab5a5ac964b (diff)
downloadgitea-828282882066aa4e8bd8fb0c083c530607bc34bb.tar.gz
gitea-828282882066aa4e8bd8fb0c083c530607bc34bb.zip
Fix action email bug
Diffstat (limited to 'routers')
-rw-r--r--routers/repo/issue.go2
-rw-r--r--routers/user/user.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/routers/repo/issue.go b/routers/repo/issue.go
index 14876e1863..c89c8b5685 100644
--- a/routers/repo/issue.go
+++ b/routers/repo/issue.go
@@ -105,7 +105,7 @@ func CreateIssue(ctx *middleware.Context, params martini.Params, form auth.Creat
}
// Notify watchers.
- if err = models.NotifyWatchers(&models.Action{ActUserId: ctx.User.Id, ActUserName: ctx.User.Name,
+ if err = models.NotifyWatchers(&models.Action{ActUserId: ctx.User.Id, ActUserName: ctx.User.Name, ActEmail: ctx.User.Email,
OpType: models.OP_CREATE_ISSUE, Content: fmt.Sprintf("%d|%s", issue.Index, issue.Name),
RepoId: ctx.Repo.Repository.Id, RepoName: ctx.Repo.Repository.Name, RefName: ""}); err != nil {
ctx.Handle(200, "issue.CreateIssue", err)
diff --git a/routers/user/user.go b/routers/user/user.go
index b0fc583978..114169e606 100644
--- a/routers/user/user.go
+++ b/routers/user/user.go
@@ -279,7 +279,7 @@ func Feeds(ctx *middleware.Context, form auth.FeedsForm) {
feeds := make([]string, len(actions))
for i := range actions {
feeds[i] = fmt.Sprintf(TPL_FEED, base.ActionIcon(actions[i].OpType),
- base.TimeSince(actions[i].Created), base.ActionDesc(actions[i], ctx.User.AvatarLink()))
+ base.TimeSince(actions[i].Created), base.ActionDesc(actions[i]))
}
ctx.JSON(200, &feeds)
}