lavender-legacy
/
gitea
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Show issue title at dashboard
release/v1.15
Unknwon 2015-11-13 10:00:38 -05:00
parent 2268d28189 ee645af107
commit 1c3754bcec
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
models/action.go
View File

@ -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,

2
templates/user/dashboard/feeds.tmpl
View File

@ -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}}