Skip to content

Do not add links to Posters or Assignees with ID < 0 #20577

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Sep 3, 2022
+76 −128
Merged

Do not add links to Posters or Assignees with ID < 0 #20577

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8281ea2
Do not add links to Posters or Assignees with ID < 0
zeripath Jul 31, 2022
4d206d2
Update templates/repo/issue/view_content/comments.tmpl
zeripath Aug 1, 2022
c8a425e
use some common templates
zeripath Aug 12, 2022
894d9f3
Merge remote-tracking branch 'origin/main' into fix-20559-no-links-to…
zeripath Aug 12, 2022
bcffc12
fix spans
zeripath Aug 12, 2022
3c3c9ed
fix spacing;
zeripath Aug 12, 2022
c73ec14
fix spacing 2
zeripath Aug 12, 2022
0bdf7cb
Merge remote-tracking branch 'origin/main' into fix-20559-no-links-to…
zeripath Sep 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions templates/org/team/teams.tmpl
View file
Original file line number Diff line number Diff line change
@@ -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">
8 changes: 2 additions & 6 deletions templates/repo/diff/comments.tmpl
View file
Original file line number Diff line number Diff line change
@@ -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">
@@ -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}}
4 changes: 1 addition & 3 deletions templates/repo/issue/new_form.tmpl
View file
Original file line number Diff line number Diff line change
@@ -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">
179 changes: 63 additions & 116 deletions templates/repo/issue/view_content/comments.tmpl
View file

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions templates/shared/user/authorlink.tmpl
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<a class="author"{{if gt .ID 0}} href="{{.HomeLink}}"{{end}}>
{{.GetDisplayName}}
</a>
3 changes: 3 additions & 0 deletions templates/shared/user/avatarlink.tmpl
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<a class="avatar"{{if gt .ID 0}} href="{{.HomeLink}}"{{end}}>
{{avatar .}}
</a>
3 changes: 3 additions & 0 deletions templates/shared/user/namelink.tmpl
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<a{{if gt .ID 0}} href="{{.HomeLink}}"{{end}}>
{{.GetDisplayName}}
</a>