Fix action avatar loading (#13909)
Fixes #13883 Co-authored-by: 6543 <6543@obermui.de>
This commit is contained in:
parent
10b9a6df0d
commit
97ab820acc
3 changed files with 17 additions and 9 deletions
|
@ -77,7 +77,8 @@ func (a *Action) GetOpType() ActionType {
|
|||
return a.OpType
|
||||
}
|
||||
|
||||
func (a *Action) loadActUser() {
|
||||
// LoadActUser loads a.ActUser
|
||||
func (a *Action) LoadActUser() {
|
||||
if a.ActUser != nil {
|
||||
return
|
||||
}
|
||||
|
@ -105,13 +106,13 @@ func (a *Action) loadRepo() {
|
|||
|
||||
// GetActFullName gets the action's user full name.
|
||||
func (a *Action) GetActFullName() string {
|
||||
a.loadActUser()
|
||||
a.LoadActUser()
|
||||
return a.ActUser.FullName
|
||||
}
|
||||
|
||||
// GetActUserName gets the action's user name.
|
||||
func (a *Action) GetActUserName() string {
|
||||
a.loadActUser()
|
||||
a.LoadActUser()
|
||||
return a.ActUser.Name
|
||||
}
|
||||
|
||||
|
|
|
@ -338,11 +338,12 @@ func NewFuncMap() []template.FuncMap {
|
|||
}
|
||||
return false
|
||||
},
|
||||
"svg": SVG,
|
||||
"avatar": Avatar,
|
||||
"avatarHTML": AvatarHTML,
|
||||
"avatarByEmail": AvatarByEmail,
|
||||
"repoAvatar": RepoAvatar,
|
||||
"svg": SVG,
|
||||
"avatar": Avatar,
|
||||
"avatarHTML": AvatarHTML,
|
||||
"avatarByAction": AvatarByAction,
|
||||
"avatarByEmail": AvatarByEmail,
|
||||
"repoAvatar": RepoAvatar,
|
||||
"SortArrow": func(normSort, revSort, urlSort string, isDefault bool) template.HTML {
|
||||
// if needed
|
||||
if len(normSort) == 0 || len(urlSort) == 0 {
|
||||
|
@ -559,6 +560,12 @@ func Avatar(user *models.User, others ...interface{}) template.HTML {
|
|||
return template.HTML("")
|
||||
}
|
||||
|
||||
// AvatarByAction renders user avatars from action. args: action, size (int), class (string)
|
||||
func AvatarByAction(action *models.Action, others ...interface{}) template.HTML {
|
||||
action.LoadActUser()
|
||||
return Avatar(action.ActUser, others...)
|
||||
}
|
||||
|
||||
// RepoAvatar renders repo avatars. args: repo, size(int), class (string)
|
||||
func RepoAvatar(repo *models.Repository, others ...interface{}) template.HTML {
|
||||
size, class := parseOthers(models.DefaultAvatarPixelSize, "ui avatar image", others...)
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
{{range .Feeds}}
|
||||
<div class="news">
|
||||
<div class="ui left">
|
||||
{{avatar .ActUser}}
|
||||
{{avatarByAction .}}
|
||||
</div>
|
||||
<div class="ui grid">
|
||||
<div class="ui fourteen wide column">
|
||||
|
|
Reference in a new issue