mirror of
https://github.com/viq/NewsBlur.git
synced 2025-09-18 21:43:31 +00:00
Fixing an issue around adding feeds and having them show up in every single folder. Sanity check to make sure that doesn't happen. Seems to only happen to feeds added to the top-level root folder.
This commit is contained in:
parent
6810293c56
commit
7c136f7ea1
1 changed files with 4 additions and 3 deletions
|
@ -153,7 +153,7 @@ def format_relative_date(date, future=False):
|
|||
return "%s hours %s" % ((((diff.seconds / 60) + 15) / 60),
|
||||
'' if future else 'ago')
|
||||
|
||||
def add_object_to_folder(obj, folder, folders):
|
||||
def add_object_to_folder(obj, folder, folders, added=False):
|
||||
if not folder and obj not in folders:
|
||||
folders.append(obj)
|
||||
return folders
|
||||
|
@ -161,9 +161,10 @@ def add_object_to_folder(obj, folder, folders):
|
|||
for k, v in enumerate(folders):
|
||||
if isinstance(v, dict):
|
||||
for f_k, f_v in v.items():
|
||||
if f_k == folder and obj not in f_v:
|
||||
if f_k == folder and obj not in f_v and not added:
|
||||
f_v.append(obj)
|
||||
folders[k][f_k] = add_object_to_folder(obj, folder, f_v)
|
||||
added = True
|
||||
folders[k][f_k] = add_object_to_folder(obj, folder, f_v, added)
|
||||
return folders
|
||||
|
||||
def mail_feed_error_to_admin(feed, e):
|
||||
|
|
Loading…
Add table
Reference in a new issue