From ae5bca50bb33d35a9b0cda379ca8fc75c76d75ae Mon Sep 17 00:00:00 2001 From: Samuel Clay Date: Thu, 28 Jan 2016 16:17:25 -0800 Subject: [PATCH] Separating flat_folders and flat_folders_with_inactive. --- apps/reader/models.py | 6 ++++-- apps/reader/views.py | 6 +++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/apps/reader/models.py b/apps/reader/models.py index a49b867f7..0987be0a3 100644 --- a/apps/reader/models.py +++ b/apps/reader/models.py @@ -1291,12 +1291,14 @@ class UserSubscriptionFolders(models.Model): def flatten_folders(self, feeds=None, inactive_feeds=None): folders = json.decode(self.folders) flat_folders = {" ": []} + if feeds and not inactive_feeds: + inactive_feeds = [] def _flatten_folders(items, parent_folder="", depth=0): for item in items: if (isinstance(item, int) and - (((not feeds) or (feeds and item in feeds)) or - ((not inactive_feeds) or (inactive_feeds and item in inactive_feeds)))): + (not feeds or + (item in feeds or item in inactive_feeds))): if not parent_folder: parent_folder = ' ' if parent_folder in flat_folders: diff --git a/apps/reader/views.py b/apps/reader/views.py index 4f20e3f9d..5f7319dd2 100644 --- a/apps/reader/views.py +++ b/apps/reader/views.py @@ -368,8 +368,11 @@ def load_feeds_flat(request): ScheduleImmediateFetches.apply_async(kwargs=dict(feed_ids=scheduled_feeds, user_id=user.pk)) flat_folders = [] + flat_folders_with_inactive = [] if folders: - flat_folders = folders.flatten_folders(feeds=feeds, inactive_feeds=inactive_feeds) + flat_folders = folders.flatten_folders(feeds=feeds) + flat_folders_with_inactive = folders.flatten_folders(feeds=feeds, + inactive_feeds=inactive_feeds) social_params = { 'user_id': user.pk, @@ -392,6 +395,7 @@ def load_feeds_flat(request): data = { "flat_folders": flat_folders, + "flat_folders_with_inactive": flat_folders_with_inactive, "feeds": feeds, "inactive_feeds": inactive_feeds, "social_feeds": social_feeds,