Skip to content

Commit ccfa408

Browse files
Fix avatar template error on repo collaborator page (#13924)
Fixes error `template: repo/settings/collaboration:16:16: executing "repo/settings/collaboration" at <.>: wrong type for value; expected *models.User; got *models.Collaborator` seen on repo collaborator page. Co-authored-by: techknowlogick <[email protected]>
1 parent 338bfee commit ccfa408

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

modules/templates/helper.go

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -550,12 +550,20 @@ func SVG(icon string, others ...interface{}) template.HTML {
550550
}
551551

552552
// Avatar renders user avatars. args: user, size (int), class (string)
553-
func Avatar(user *models.User, others ...interface{}) template.HTML {
553+
func Avatar(item interface{}, others ...interface{}) template.HTML {
554554
size, class := parseOthers(models.DefaultAvatarPixelSize, "ui avatar image", others...)
555555

556-
src := user.RealSizedAvatarLink(size * models.AvatarRenderedSizeFactor)
557-
if src != "" {
558-
return AvatarHTML(src, size, class, user.DisplayName())
556+
if user, ok := item.(*models.User); ok {
557+
src := user.RealSizedAvatarLink(size * models.AvatarRenderedSizeFactor)
558+
if src != "" {
559+
return AvatarHTML(src, size, class, user.DisplayName())
560+
}
561+
}
562+
if user, ok := item.(*models.Collaborator); ok {
563+
src := user.RealSizedAvatarLink(size * models.AvatarRenderedSizeFactor)
564+
if src != "" {
565+
return AvatarHTML(src, size, class, user.DisplayName())
566+
}
559567
}
560568
return template.HTML("")
561569
}

0 commit comments

Comments
 (0)