From 95f2e2b57beedcdeb2b9623dc86e26f252fdd7bd Mon Sep 17 00:00:00 2001
From: kolaente <konrad@kola-entertainments.de>
Date: Wed, 9 May 2018 18:29:04 +0200
Subject: Multiple assignees (#3705)

---
 templates/repo/issue/view_content/comments.tmpl | 32 ++++++++++++++++++-------
 1 file changed, 23 insertions(+), 9 deletions(-)

(limited to 'templates/repo/issue/view_content/comments.tmpl')

diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl
index b6d2c96bb5..dc266218bf 100644
--- a/templates/repo/issue/view_content/comments.tmpl
+++ b/templates/repo/issue/view_content/comments.tmpl
@@ -118,15 +118,29 @@
 	{{else if eq .Type 9}}
 		<div class="event">
 			<span class="octicon octicon-primitive-dot"></span>
-			{{if gt .AssigneeID 0}}{{if eq .Poster.ID .AssigneeID}}<a class="ui avatar image" href="{{.Poster.HomeLink}}">
-				<img src="{{.Poster.RelAvatarLink}}">
-			</a> <span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a> {{$.i18n.Tr "repo.issues.self_assign_at" $createdStr | Safe}} </span>
-			{{else}}<a class="ui avatar image" href="{{.Assignee.HomeLink}}">
-				<img src="{{.Assignee.RelAvatarLink}}">
-			</a><span class="text grey"><a href="{{.Assignee.HomeLink}}">{{.Assignee.Name}}</a> {{$.i18n.Tr "repo.issues.add_assignee_at" .Poster.Name $createdStr | Safe}} </span>{{end}}{{else if gt .OldAssigneeID 0}}
-			<a class="ui avatar image" href="{{.Poster.HomeLink}}">
-				<img src="{{.Poster.RelAvatarLink}}">
-			</a> <span class="text grey"><a href="{{.Poster.HomeLink}}">{{.Poster.Name}}</a> {{$.i18n.Tr "repo.issues.remove_assignee_at" $createdStr | Safe}} </span>{{end}}
+			{{if gt .AssigneeID 0}}
+				{{if .RemovedAssignee}}
+					<a class="ui avatar image" href="{{.Assignee.HomeLink}}">
+						<img src="{{.Assignee.RelAvatarLink}}">
+					</a>
+					<span class="text grey">
+						<a href="{{.Assignee.HomeLink}}">{{.Assignee.Name}}</a>
+						{{$.i18n.Tr "repo.issues.remove_assignee_at" $createdStr | Safe}}
+					</span>
+				{{else}}
+					<a class="ui avatar image" href="{{.Assignee.HomeLink}}">
+						<img src="{{.Assignee.RelAvatarLink}}">
+					</a>
+					<span class="text grey">
+						<a href="{{.Assignee.HomeLink}}">{{.Assignee.Name}}</a>
+						{{if eq .Poster.ID .AssigneeID}}
+							{{$.i18n.Tr "repo.issues.self_assign_at" $createdStr | Safe}}
+						{{else}}
+							{{$.i18n.Tr "repo.issues.add_assignee_at" .Poster.Name $createdStr | Safe}}
+						{{end}}
+					</span>
+				{{end}}
+			{{end}}
 		</div>
 	{{else if eq .Type 10}}
 		<div class="event">
-- 
cgit v1.2.3