Merge branch 'django1.10' into django1.11

* django1.10:
  Adding feed unread count refresh when changing intelligence level.
  Task fetches error.
This commit is contained in:
Samuel Clay 2020-11-12 18:41:17 -05:00
commit 0f87f7b2b6
2 changed files with 2 additions and 1 deletions

View file

@ -4754,6 +4754,7 @@
NEWSBLUR.assets.folders.update_all_folder_visibility();
NEWSBLUR.app.feed_list.scroll_to_selected();
NEWSBLUR.app.dashboard_river.load_stories();
this.force_feeds_refresh();
$('.NB-active', $slider).removeClass('NB-active');
if (this.flags['feed_list_showing_starred']) {

View file

@ -35,7 +35,7 @@ def main():
data={"from": "NewsBlur Task Monitor: %s <admin@%s.newsblur.com>" % (hostname, hostname),
"to": [admin_email],
"subject": "%s feeds fetched falling: %s" % (hostname, feeds_fetched),
"text": "Feed fetches are falling (%s): %s" % (hostname, feeds_fetched, failed)})
"text": "Feed fetches are falling: %s" % (hostname, feeds_fetched, failed)})
print(" ---> Feeds fetched falling! %s" % (feeds_fetched))
else:
print(" ---> Feeds fetched OK: %s" % (feeds_fetched))