Merge pull request #1935 from makhov/issue-title-at-dashboard

Show issue title at dashboard

2 files changed, 12 insertions, 1 deletions

diff --git a/models/action.go b/models/action.go
index e94bb9441b..19fd9102fb 100644
--- a/models/action.go
+++ b/models/action.go
@@ -15,6 +15,7 @@ import (
 	"unicode"
 
 	"github.com/go-xorm/xorm"
+	"github.com/Unknwon/com"
 
 	api "github.com/gogits/go-gogs-client"
 
@@ -136,6 +137,16 @@ func (a Action) GetIssueInfos() []string {
 	return strings.SplitN(a.Content, "|", 2)
 }
 
+func (a Action) GetIssueTitle() string {
+	issueIndex := com.StrTo(a.GetIssueInfos()[0]).MustInt64()
+	issue, err := GetIssueByIndex(a.RepoID, issueIndex)
+	if err != nil {
+		log.Error(4, "GetIssueByID: %v", err)
+		return "500 when get title"
+	}
+	return issue.Name
+}
+
 func newRepoAction(e Engine, u *User, repo *Repository) (err error) {
 	if err = notifyWatchers(e, &Action{
 		ActUserID:    u.Id,
diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl
index a79ff5531b..bff44f06bb 100644
--- a/templates/user/dashboard/feeds.tmpl
+++ b/templates/user/dashboard/feeds.tmpl
@@ -24,7 +24,7 @@
             {{$.i18n.Tr "action.push_tag" .GetRepoLink .GetBranch .GetRepoPath | Str2html}}
             {{else if eq .GetOpType 10}}
             {{ $index := index .GetIssueInfos 0}}
-            {{$.i18n.Tr "action.comment_issue" .GetRepoLink $index .GetRepoPath | Str2html}}
+            {{$.i18n.Tr "action.comment_issue" .GetRepoLink $index .GetRepoPath | Str2html}} – {{.GetIssueTitle}}
             {{else if eq .GetOpType 11}}
             {{ $index := index .GetIssueInfos 0}}
             {{$.i18n.Tr "action.merge_pull_request" .GetRepoLink $index .GetRepoPath | Str2html}}