diff options
| author | zeripath <art27@cantab.net> | 2021-03-06 04:09:49 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-06 05:09:49 +0100 |
| commit | 20f13bfdfc5f801e6db319d8d87da0ee139aa32e (patch) | |
| tree | 4d4b3696379aeba04f0b78ea18ec869e299b0d2e | |
| parent | fd4b309c6f15ad0770067f42ed9a5a6abace3d96 (diff) | |
| download | gitea-20f13bfdfc5f801e6db319d8d87da0ee139aa32e.tar.gz gitea-20f13bfdfc5f801e6db319d8d87da0ee139aa32e.zip | |
Fix a couple of issues with a feeds (#14897)
@CirnoT spotted a couple of issues with feeds on discord.
This PR fixes both of these.
| -rw-r--r-- | modules/templates/helper.go | 4 | ||||
| -rw-r--r-- | templates/user/dashboard/feeds.tmpl | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/modules/templates/helper.go b/modules/templates/helper.go index d3f6b8e06f..ab66cc7282 100644 --- a/modules/templates/helper.go +++ b/modules/templates/helper.go @@ -817,6 +817,10 @@ func ActionIcon(opType models.ActionType) string { func ActionContent2Commits(act Actioner) *repository.PushCommits { push := repository.NewPushCommits() + if act == nil || act.GetContent() == "" { + return push + } + json := jsoniter.ConfigCompatibleWithStandardLibrary if err := json.Unmarshal([]byte(act.GetContent()), push); err != nil { log.Error("json.Unmarshal:\n%s\nERROR: %v", act.GetContent(), err) diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl index d25920a24e..057a4a7625 100644 --- a/templates/user/dashboard/feeds.tmpl +++ b/templates/user/dashboard/feeds.tmpl @@ -110,7 +110,8 @@ <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)}} <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}} <p class="text light grey">{{index .GetIssueInfos 1}}</p> {{else if or (eq .GetOpType 12) (eq .GetOpType 13) (eq .GetOpType 14) (eq .GetOpType 15)}} |