From b3e0391f53d98b777d6cdb21ba0492c31927a6f0 Mon Sep 17 00:00:00 2001 From: François Schmidts Date: Fri, 22 Jan 2016 22:43:39 +0100 Subject: ordering feeds --- src/web/views/views.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/web/views') diff --git a/src/web/views/views.py b/src/web/views/views.py index ae3d9b01..cc9b421c 100644 --- a/src/web/views/views.py +++ b/src/web/views/views.py @@ -262,14 +262,16 @@ def get_menu(): @app.route('/middle_panel') @login_required def get_middle_panel(): - fd_hash = {fd.id: fd for fd in FeedController(g.user.id).read()} + fd_hash = {feed.id: {'title': feed.title, + 'icon_url': url_for('icon.icon', url=feed.icon_url) + if feed.icon_url else None} + for feed in FeedController(g.user.id).read()} articles = ArticleController(g.user.id).read(readed=False).order_by('date') return jsonify(**{'articles': [{'title': art.title, 'liked': art.like, 'read': art.readed, 'article_id': art.id, 'feed_id': art.feed_id, 'category_id': art.category_id or 0, - 'feed_title': fd_hash[art.feed_id].title, - 'icon_url': url_for('icon.icon', url=fd_hash[art.feed_id].icon_url) - if fd_hash[art.feed_id].icon_url else None, + 'feed_title': fd_hash[art.feed_id]['title'], + 'icon_url': fd_hash[art.feed_id]['icon_url'], 'date': art.date} for art in articles]}) -- cgit