diff options
| author | Unknwon <u@gogs.io> | 2016-03-05 12:58:51 -0500 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2016-03-05 12:58:51 -0500 |
| commit | 414eb22ef97d664da790a348dab403961f365976 (patch) | |
| tree | 80c897880fbcad21225c4faa9198e0d82db3dca3 /templates | |
| parent | a2f13eae559c71d35662b7767a8b8347a26eb53e (diff) | |
| download | gitea-414eb22ef97d664da790a348dab403961f365976.tar.gz gitea-414eb22ef97d664da790a348dab403961f365976.zip | |
#1597 fix activitity feeds for pull requests
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/.VERSION | 2 | ||||
| -rw-r--r-- | templates/user/dashboard/feeds.tmpl | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/templates/.VERSION b/templates/.VERSION index 62a9b80e4f..505aa1c97e 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.8.57.0305
\ No newline at end of file +0.8.58.0305
\ No newline at end of file diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl index 4206308e3b..00982e5b81 100644 --- a/templates/user/dashboard/feeds.tmpl +++ b/templates/user/dashboard/feeds.tmpl @@ -37,6 +37,12 @@ {{else if eq .GetOpType 13}} {{ $index := index .GetIssueInfos 0}} {{$.i18n.Tr "action.reopen_issue" .GetRepoLink $index .ShortRepoPath | Str2html}} + {{else if eq .GetOpType 14}} + {{ $index := index .GetIssueInfos 0}} + {{$.i18n.Tr "action.close_pull_request" .GetRepoLink $index .ShortRepoPath | Str2html}} + {{else if eq .GetOpType 15}} + {{ $index := index .GetIssueInfos 0}} + {{$.i18n.Tr "action.reopen_pull_request" .GetRepoLink $index .ShortRepoPath | Str2html}} {{end}} </p> {{if eq .GetOpType 5}} @@ -55,13 +61,13 @@ {{else if eq .GetOpType 6}} <span class="text truncate issue title has-emoji">{{index .GetIssueInfos 1}}</span> {{else if eq .GetOpType 7}} - <p class="text light grey has-emoji">{{index .GetIssueInfos 1}}</p> + <span class="text truncate issue title has-emoji">{{index .GetIssueInfos 1}}</span> {{else if eq .GetOpType 10}} <span class="text truncate issue title has-emoji">{{.GetIssueTitle}}</span> <p class="text light grey has-emoji">{{index .GetIssueInfos 1}}</p> {{else if eq .GetOpType 11}} <p class="text light grey has-emoji">{{index .GetIssueInfos 1}}</p> - {{else if (or (eq .GetOpType 12) (eq .GetOpType 13))}} + {{else if (or (or (eq .GetOpType 12) (eq .GetOpType 13)) (or (eq .GetOpType 14) (eq .GetOpType 15)))}} <span class="text truncate issue title has-emoji">{{.GetIssueTitle}}</span> {{end}} <p class="text italic light grey">{{TimeSince .GetCreate $.i18n.Lang}}</p> |