diff options
| author | 无闻 <joe2010xtmf@163.com> | 2014-07-24 04:25:00 -0400 |
|---|---|---|
| committer | 无闻 <joe2010xtmf@163.com> | 2014-07-24 04:25:00 -0400 |
| commit | a76a948a029f46697a0e2327ea6ca86872a760d7 (patch) | |
| tree | 52e07c859411253fd87f29a3e6798e3f082b0459 /templates/repo | |
| parent | 6e9f1c52b18f112eecd5c72e295cfea1809f07fa (diff) | |
| parent | d43c5895bc5026fb29dd9aa509056e49b4644ba7 (diff) | |
| download | gitea-a76a948a029f46697a0e2327ea6ca86872a760d7.tar.gz gitea-a76a948a029f46697a0e2327ea6ca86872a760d7.zip | |
Merge pull request #305 from nuss-justin/feature/commit-issue-fix
Fix #302. Show referencing commits in issue.
Diffstat (limited to 'templates/repo')
| -rw-r--r-- | templates/repo/issue/view.tmpl | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/templates/repo/issue/view.tmpl b/templates/repo/issue/view.tmpl index d95fba40d8..653734767e 100644 --- a/templates/repo/issue/view.tmpl +++ b/templates/repo/issue/view.tmpl @@ -49,6 +49,7 @@ </div> </div> {{range .Comments}} + {{/* 0 = COMMENT, 1 = REOPEN, 2 = CLOSE, 3 = ISSUE, 4 = COMMIT, 5 = PULL */}} {{if eq .Type 0}} <div class="issue-child" id="issue-comment-{{.Id}}"> <a class="user pull-left" href="/user/{{.Poster.Name}}"><img class="avatar" src="{{.Poster.AvatarLink}}" alt=""/></a> @@ -78,6 +79,17 @@ <a class="user pull-left" href="/user/{{.Poster.Name}}">{{.Poster.Name}}</a> <span class="label label-danger">Closed</span> this issue <span class="time">{{TimeSince .Created}}</span> </div> </div> + {{else if eq .Type 4}} + <div class="issue-child issue-reference issue-reference-commit"> + <a class="user pull-left" href="/user/{{.Poster.Name}}"><img class="avatar" src="{{.Poster.AvatarLink}}" alt=""/></a> + <div class="issue-content"> + <a class="user pull-left" href="/user/{{.Poster.Name}}">{{.Poster.Name}}</a> <span class="label label-primary">Referenced</span> this issue <span class="time">{{TimeSince .Created}}</span> + <p> + <a class="user pull-left" href="/user/{{.Poster.Name}}"><img class="avatar" src="{{.Poster.AvatarLink}}" alt=""/></a> + {{.ContentHtml}} + </p> + </div> + </div> {{end}} {{end}} <hr class="issue-line"/> |