diff options
| author | François Schmidts <francois.schmidts@gmail.com> | 2016-01-31 22:32:10 +0100 |
|---|---|---|
| committer | François Schmidts <francois.schmidts@gmail.com> | 2016-01-31 22:32:10 +0100 |
| commit | db6e918ee5a92429738f2e87afb1af8f024d5053 (patch) | |
| tree | 5df4a69af341b0879ff6fac2022d0c662f0353d6 /src/web/views | |
| parent | handling errors from one page app (diff) | |
| download | newspipe-db6e918ee5a92429738f2e87afb1af8f024d5053.tar.gz newspipe-db6e918ee5a92429738f2e87afb1af8f024d5053.tar.bz2 newspipe-db6e918ee5a92429738f2e87afb1af8f024d5053.zip | |
enhancement: ordering categories and hidding empty 'no category' category
Diffstat (limited to 'src/web/views')
| -rw-r--r-- | src/web/views/views.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/web/views/views.py b/src/web/views/views.py index 0ae37a8d..223f96e9 100644 --- a/src/web/views/views.py +++ b/src/web/views/views.py @@ -243,8 +243,11 @@ def home(): @app.route('/menu') @login_required def get_menu(): - categories = {c.id: c.dump() for c in CategoryController(g.user.id).read()} - categories[0] = {'name': 'No category', 'id': 0} + categories_order = [0] + categories = {0: {'name': 'No category', 'id': 0}} + for cat in CategoryController(g.user.id).read().order_by('name'): + categories_order.append(cat.id) + categories[cat.id] = cat.dump() unread = ArticleController(g.user.id).count_by_feed(readed=False) for cat_id in categories: categories[cat_id]['unread'] = 0 @@ -262,6 +265,7 @@ def get_menu(): categories[feed['category_id']]['unread'] += feed['unread'] categories[feed['category_id']]['feeds'].append(feed_id) return jsonify(**{'feeds': feeds, 'categories': categories, + 'categories_order': categories_order, 'crawling_method': conf.CRAWLING_METHOD, 'max_error': conf.DEFAULT_MAX_ERROR, 'error_threshold': conf.ERROR_THRESHOLD, |