Skip to content

Commit 7aafe5e

Browse files
GiteaBotinvliD
andauthored
Fix rendering assignee changed comments without assignee (#27927) (#27952)
Backport #27927 by @invliD When an assignee changed event comment is rendered, most of it is guarded behind the assignee ID not being 0. However, if it is 0, that results in quite broken rendering for that comment and the next one. This can happen, for example, when repository data imported from outside of Gitea is incomplete. This PR makes sure comments with an assignee ID of 0 are not rendered at all. --- Screenshot before: <img width="272" alt="Bildschirm­foto 2023-11-05 um 20 12 18" src="https://github.com/go-gitea/gitea/assets/42910/7d629d76-fee4-4fe5-9e3a-bf524050cead"> The comments in this screenshot are: 1. A regular text comment 2. A user being unassigned 3. A user being assigned 4. The title of the PR being changed Comments 2 and 3 are rendered without any text, which indents the next comment and does not leave enough vertical space. Co-authored-by: Sebastian Brückner <[email protected]>
1 parent 9e15955 commit 7aafe5e

File tree

1 file changed

+23
-24
lines changed

1 file changed

+23
-24
lines changed

templates/repo/issue/view_content/comments.tmpl

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
{{$createdStr:= TimeSinceUnix .CreatedUnix ctx.Locale}}
55

66
<!-- 0 = COMMENT, 1 = REOPEN, 2 = CLOSE, 3 = ISSUE_REF, 4 = COMMIT_REF,
7-
5 = COMMENT_REF, 6 = PULL_REF, 7 = COMMENT_LABEL, 12 = START_TRACKING,
7+
5 = COMMENT_REF, 6 = PULL_REF, 7 = COMMENT_LABEL, 8 = MILESTONE_CHANGE,
8+
9 = ASSIGNEES_CHANGE, 10 = TITLE_CHANGE, 11 = DELETE_BRANCH, 12 = START_TRACKING,
89
13 = STOP_TRACKING, 14 = ADD_TIME_MANUAL, 16 = ADDED_DEADLINE, 17 = MODIFIED_DEADLINE,
910
18 = REMOVED_DEADLINE, 19 = ADD_DEPENDENCY, 20 = REMOVE_DEPENDENCY, 21 = CODE,
1011
22 = REVIEW, 23 = ISSUE_LOCKED, 24 = ISSUE_UNLOCKED, 25 = TARGET_BRANCH_CHANGED,
@@ -184,31 +185,29 @@
184185
{{if gt .OldMilestoneID 0}}{{if gt .MilestoneID 0}}{{ctx.Locale.Tr "repo.issues.change_milestone_at" (.OldMilestone.Name|Escape) (.Milestone.Name|Escape) $createdStr | Safe}}{{else}}{{ctx.Locale.Tr "repo.issues.remove_milestone_at" (.OldMilestone.Name|Escape) $createdStr | Safe}}{{end}}{{else if gt .MilestoneID 0}}{{ctx.Locale.Tr "repo.issues.add_milestone_at" (.Milestone.Name|Escape) $createdStr | Safe}}{{end}}
185186
</span>
186187
</div>
187-
{{else if eq .Type 9}}
188+
{{else if and (eq .Type 9) (gt .AssigneeID 0)}}
188189
<div class="timeline-item event" id="{{.HashTag}}">
189190
<span class="badge">{{svg "octicon-person"}}</span>
190-
{{if gt .AssigneeID 0}}
191-
{{if .RemovedAssignee}}
192-
{{template "shared/user/avatarlink" dict "user" .Assignee}}
193-
<span class="text grey muted-links">
194-
{{template "shared/user/authorlink" .Assignee}}
195-
{{if eq .Poster.ID .Assignee.ID}}
196-
{{ctx.Locale.Tr "repo.issues.remove_self_assignment" $createdStr | Safe}}
197-
{{else}}
198-
{{ctx.Locale.Tr "repo.issues.remove_assignee_at" (.Poster.GetDisplayName|Escape) $createdStr | Safe}}
199-
{{end}}
200-
</span>
201-
{{else}}
202-
{{template "shared/user/avatarlink" dict "user" .Assignee}}
203-
<span class="text grey muted-links">
204-
{{template "shared/user/authorlink" .Assignee}}
205-
{{if eq .Poster.ID .AssigneeID}}
206-
{{ctx.Locale.Tr "repo.issues.self_assign_at" $createdStr | Safe}}
207-
{{else}}
208-
{{ctx.Locale.Tr "repo.issues.add_assignee_at" (.Poster.GetDisplayName|Escape) $createdStr | Safe}}
209-
{{end}}
210-
</span>
211-
{{end}}
191+
{{if .RemovedAssignee}}
192+
{{template "shared/user/avatarlink" dict "user" .Assignee}}
193+
<span class="text grey muted-links">
194+
{{template "shared/user/authorlink" .Assignee}}
195+
{{if eq .Poster.ID .Assignee.ID}}
196+
{{ctx.Locale.Tr "repo.issues.remove_self_assignment" $createdStr | Safe}}
197+
{{else}}
198+
{{ctx.Locale.Tr "repo.issues.remove_assignee_at" (.Poster.GetDisplayName|Escape) $createdStr | Safe}}
199+
{{end}}
200+
</span>
201+
{{else}}
202+
{{template "shared/user/avatarlink" dict "user" .Assignee}}
203+
<span class="text grey muted-links">
204+
{{template "shared/user/authorlink" .Assignee}}
205+
{{if eq .Poster.ID .AssigneeID}}
206+
{{ctx.Locale.Tr "repo.issues.self_assign_at" $createdStr | Safe}}
207+
{{else}}
208+
{{ctx.Locale.Tr "repo.issues.add_assignee_at" (.Poster.GetDisplayName|Escape) $createdStr | Safe}}
209+
{{end}}
210+
</span>
212211
{{end}}
213212
</div>
214213
{{else if eq .Type 10}}

0 commit comments

Comments
 (0)