diff options
| author | oscar.lofwenhamn <44643697+oscarlofwenhamn@users.noreply.github.com> | 2019-03-27 23:22:39 +0100 |
|---|---|---|
| committer | techknowlogick <matti@mdranta.net> | 2019-03-27 18:22:39 -0400 |
| commit | 2019983e77895b4e41724bfa3297f5dd730ff37d (patch) | |
| tree | 92d6d24812cd150f34d44425551d51bd1a9cc815 /templates/user | |
| parent | ee0d3eeadc7d563e4ffe87d51becf5a2e6be4e69 (diff) | |
| download | gitea-2019983e77895b4e41724bfa3297f5dd730ff37d.tar.gz gitea-2019983e77895b4e41724bfa3297f5dd730ff37d.zip | |
Make "Ghost" not link to 404 page (#6410)
* Make Ghost not link to 404 page
* Make correct localization label show
* Create and use GetLastEventLabelFake for when a Ghost user has made the action, thus not linking to a user profile
* Add corresponding _fake entries to locale_en-US
* Make Ghost avatar not link to 404 page
* Make Ghost on milestone_issues not link to 404 page
Diffstat (limited to 'templates/user')
| -rw-r--r-- | templates/user/dashboard/feeds.tmpl | 6 | ||||
| -rw-r--r-- | templates/user/dashboard/issues.tmpl | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl index 849ad7fb2f..ffc0db3317 100644 --- a/templates/user/dashboard/feeds.tmpl +++ b/templates/user/dashboard/feeds.tmpl @@ -7,7 +7,11 @@ <div class="ui fourteen wide column"> <div class="{{if or (eq .GetOpType 5) (eq .GetOpType 18)}}push news{{end}}"> <p> - <a href="{{AppSubUrl}}/{{.GetActUserName}}" title="{{.GetActFullName}}">{{.ShortActUserName}}</a> + {{if gt .ActUser.ID 0}} + <a href="{{AppSubUrl}}/{{.GetActUserName}}" title="{{.GetActFullName}}">{{.ShortActUserName}}</a> + {{else}} + {{.ShortActUserName}} + {{end}} {{if eq .GetOpType 1}} {{$.i18n.Tr "action.create_repo" .GetRepoLink .ShortRepoPath | Str2html}} {{else if eq .GetOpType 2}} diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl index b5990e61e0..93286df578 100644 --- a/templates/user/dashboard/issues.tmpl +++ b/templates/user/dashboard/issues.tmpl @@ -86,7 +86,11 @@ {{end}} <p class="desc"> - {{$.i18n.Tr "repo.issues.opened_by" $timeStr .Poster.HomeLink .Poster.Name | Safe}} + {{if gt .Poster.ID 0}} + {{$.i18n.Tr .GetLastEventLabel $timeStr .Poster.HomeLink .Poster.Name | Safe}} + {{else}} + {{$.i18n.Tr .GetLastEventLabelFake $timeStr .Poster.Name | Safe}} + {{end}} {{if .Assignee}} <a class="ui right assignee poping up" href="{{.Assignee.HomeLink}}" data-content="{{.Assignee.Name}}" data-variation="inverted" data-position="left center"> <img class="ui avatar image" src="{{.Assignee.RelAvatarLink}}"> |