Fix visibility of org avatars (#17789)
* Fix visibility of org avatar * more clear syntax Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
This commit is contained in:
parent
21f4401f3e
commit
754fdd8f9c
1 changed files with 15 additions and 9 deletions
|
@ -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())
|
||||
}
|
||||
}
|
||||
if user, ok := item.(*models.Collaborator); ok {
|
||||
src := user.AvatarLinkWithSize(size * avatars.AvatarRenderedSizeFactor)
|
||||
if src != "" {
|
||||
return AvatarHTML(src, size, class, user.DisplayName())
|
||||
return AvatarHTML(src, size, class, t.DisplayName())
|
||||
}
|
||||
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, t.AsUser().DisplayName())
|
||||
}
|
||||
}
|
||||
|
||||
return template.HTML("")
|
||||
}
|
||||
|
||||
|
|
Reference in a new issue