From 8ee1a09dc71ad779e36175b38450576ae510daf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Guillot?= Date: Tue, 2 Apr 2019 21:17:01 -0700 Subject: [PATCH] Always display feed entries even when there is a feed error --- template/html/feed_entries.html | 4 +++- template/views.go | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/template/html/feed_entries.html b/template/html/feed_entries.html index 38374f2..a7daa8a 100644 --- a/template/html/feed_entries.html +++ b/template/html/feed_entries.html @@ -43,7 +43,9 @@

{{ t "alert.feed_error" }}

{{ t .feed.ParsingErrorMsg }}

-{{ else if not .entries }} +{{ end }} + +{{ if not .entries }} {{ if .showOnlyUnreadEntries }}

{{ t "alert.no_unread_entry" }}

{{ else }} diff --git a/template/views.go b/template/views.go index 5acf040..c23503c 100644 --- a/template/views.go +++ b/template/views.go @@ -735,7 +735,9 @@ var templateViewsMap = map[string]string{

{{ t "alert.feed_error" }}

{{ t .feed.ParsingErrorMsg }}

-{{ else if not .entries }} +{{ end }} + +{{ if not .entries }} {{ if .showOnlyUnreadEntries }}

{{ t "alert.no_unread_entry" }}

{{ else }} @@ -1415,7 +1417,7 @@ var templateViewsMapChecksums = map[string]string{ "edit_feed": "ab30c31a4385a7b16c54baa78bdcb93a57181ed1c5018ce097d7eb50673bb995", "edit_user": "f4f99412ba771cfca2a2a42778b023b413c5494e9a287053ba8cf380c2865c5f", "entry": "2ea9fee1ae5513ef1abb5923221c2ef1212e26d3bb651da66069ce8a336cbb7c", - "feed_entries": "ba6a764d2784797629103500cc099178f29856dcfc95e59f0d134c32951cd3a4", + "feed_entries": "f76de17ba8739c94897c3259e72acc82f7b74181125ee78c2873c5e5f20215f3", "feeds": "31acc253c547a6cce5710d72a6f6b3b396162ecd5e5af295b2cf47c1ff55bd06", "history_entries": "b65ca1d85615caa7c314a33f1cb997aa3477a79e66b9894b2fd387271ad467d2", "import": "8349e47a783bb40d8e9248b4771656e5f006185e11079e1c4680dd52633420ed", -- 2.45.2