troldspejlet/forgejo
troldspejlet/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-27 21:03:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fix a couple of issues with a feeds (#14897)

Browse source 
@CirnoT spotted a couple of issues with feeds on discord.

This PR fixes both of these.
This commit is contained in:
zeripath 2021-03-06 04:09:49 +00:00 committed by GitHub
parent fd4b309c6f
commit 20f13bfdfc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/templates/helper.go
View file

@ -817,6 +817,10 @@ func ActionIcon(opType models.ActionType) string {
func ActionContent2Commits(act Actioner) *repository.PushCommits { func ActionContent2Commits(act Actioner) *repository.PushCommits {
push := repository.NewPushCommits() push := repository.NewPushCommits()
if act == nil || act.GetContent() == "" {
return push
}
json := jsoniter.ConfigCompatibleWithStandardLibrary json := jsoniter.ConfigCompatibleWithStandardLibrary
if err := json.Unmarshal([]byte(act.GetContent()), push); err != nil { if err := json.Unmarshal([]byte(act.GetContent()), push); err != nil {
log.Error("json.Unmarshal:\n%s\nERROR: %v", act.GetContent(), err) log.Error("json.Unmarshal:\n%s\nERROR: %v", act.GetContent(), err)

3
templates/user/dashboard/feeds.tmpl
View file

@ -110,7 +110,8 @@
<span class="text truncate issue title">{{index .GetIssueInfos 1 | RenderEmoji}}</span> <span class="text truncate issue title">{{index .GetIssueInfos 1 | RenderEmoji}}</span>
{{else if or (eq .GetOpType 10) (eq .GetOpType 21) (eq .GetOpType 22) (eq .GetOpType 23)}} {{else if or (eq .GetOpType 10) (eq .GetOpType 21) (eq .GetOpType 22) (eq .GetOpType 23)}}
<a href="{{.GetCommentLink}}" class="text truncate issue title">{{.GetIssueTitle | RenderEmoji}}</a> <a href="{{.GetCommentLink}}" class="text truncate issue title">{{.GetIssueTitle | RenderEmoji}}</a>
<p class="text light grey">{{index .GetIssueInfos 1 | RenderEmoji}}</p> {{$comment := index .GetIssueInfos 1}}
{{if gt (len $comment) 0}}<p class="text light grey">{{$comment | RenderEmoji}}</p>{{end}}
{{else if eq .GetOpType 11}} {{else if eq .GetOpType 11}}
<p class="text light grey">{{index .GetIssueInfos 1}}</p> <p class="text light grey">{{index .GetIssueInfos 1}}</p>
{{else if or (eq .GetOpType 12) (eq .GetOpType 13) (eq .GetOpType 14) (eq .GetOpType 15)}} {{else if or (eq .GetOpType 12) (eq .GetOpType 13) (eq .GetOpType 14) (eq .GetOpType 15)}}