Fix visibility of org avatars (go-gitea#17789)

* Fix visibility of org avatar * more clear syntax Co-authored-by: Lunny Xiao <[email protected]>
rampall · Nov 24, 2021 · 754fdd8 · 754fdd8
1 parent 21f4401
commit 754fdd8
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/modules/templates/helper.go b/modules/templates/helper.go
@@ -553,18 +553,24 @@ func SVG(icon string, others ...interface{}) template.HTML {
 func Avatar(item interface{}, others ...interface{}) template.HTML {
 	size, class := parseOthers(avatars.DefaultAvatarPixelSize, "ui avatar image", others...)
 
-	if user, ok := item.(*models.User); ok {
-		src := user.AvatarLinkWithSize(size * avatars.AvatarRenderedSizeFactor)
+	switch t := item.(type) {
+	case *models.User:
+		src := t.AvatarLinkWithSize(size * avatars.AvatarRenderedSizeFactor)
 		if src != "" {
-			return AvatarHTML(src, size, class, user.DisplayName())
+			return AvatarHTML(src, size, class, t.DisplayName())
 		}
-	}
-	if user, ok := item.(*models.Collaborator); ok {
-		src := user.AvatarLinkWithSize(size * avatars.AvatarRenderedSizeFactor)
+	case *models.Collaborator:
+		src := t.AvatarLinkWithSize(size * avatars.AvatarRenderedSizeFactor)
+		if src != "" {
+			return AvatarHTML(src, size, class, t.DisplayName())
+		}
+	case *models.Organization:
+		src := t.AsUser().AvatarLinkWithSize(size * avatars.AvatarRenderedSizeFactor)
 		if src != "" {
-			return AvatarHTML(src, size, class, user.DisplayName())
+			return AvatarHTML(src, size, class, t.AsUser().DisplayName())
 		}
 	}
+
 	return template.HTML("")
 }