Skip to content

Commit

Permalink
Do not add links to Posters or Assignees with ID < 0 (#20577)
Browse files Browse the repository at this point in the history
There are several places in templates/repo/issue/view_content/comments.tmpl where links are made to Posters or Assignees who are Ghosts or have IDs <0.

Fix #20559

Signed-off-by: Andrew Thornton <art27@cantab.net>
  • Loading branch information
zeripath authored Sep 3, 2022
1 parent 18046eb commit de7b87f
Show file tree
Hide file tree
Showing 7 changed files with 76 additions and 128 deletions.
4 changes: 1 addition & 3 deletions templates/org/team/teams.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@
</div>
<div class="ui attached segment members">
{{range .Members}}
<a href="{{.HomeLink}}" title="{{.Name}}">
{{avatar .}}
</a>
{{template "shared/user/avatarlink" .}}
{{end}}
</div>
<div class="ui bottom attached header">
Expand Down
8 changes: 2 additions & 6 deletions templates/repo/diff/comments.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
{{if .OriginalAuthor}}
<span class="avatar"><img src="{{AppSubUrl}}/assets/img/avatar_default.png"></span>
{{else}}
<a class="avatar" {{if gt .Poster.ID 0}}href="{{.Poster.HomeLink}}"{{end}}>
{{avatar .Poster}}
</a>
{{template "shared/user/avatarlink" .Poster}}
{{end}}
<div class="content comment-container">
<div class="ui top attached header comment-header df ac sb">
Expand All @@ -27,9 +25,7 @@
</span>
{{else}}
<span class="text grey">
<a {{if gt .Poster.ID 0}}href="{{.Poster.HomeLink}}"{{end}}>
{{.Poster.GetDisplayName}}
</a>
{{template "shared/user/namelink" .Poster}}
{{$.root.locale.Tr "repo.issues.commented_at" (.HashTag|Escape) $createdStr | Safe}}
</span>
{{end}}
Expand Down
4 changes: 1 addition & 3 deletions templates/repo/issue/new_form.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@
<div class="twelve wide column">
<div class="ui comments">
<div class="comment">
<a class="avatar" href="{{.SignedUser.HomeLink}}">
{{avatar .SignedUser}}
</a>
{{template "shared/user/avatarlink" .SignedUser}}
<div class="ui segment content">
<div class="field">
<input name="title" id="issue_title" placeholder="{{.locale.Tr "repo.milestones.title"}}" value="{{if .TitleQuery}}{{.TitleQuery}}{{else if .IssueTemplateTitle}}{{.IssueTemplateTitle}}{{else}}{{.title}}{{end}}" tabindex="3" autofocus required maxlength="255" autocomplete="off">
Expand Down
Loading

0 comments on commit de7b87f

Please sign in to comment.