public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-04-13 09:38:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allowing adding a url even if already subscribed. Just checks for dupes in the specific folder, but otherwise, dupes are allowed.

Browse source
This commit is contained in:
Samuel Clay 2011-02-14 01:15:45 -05:00
parent 6549aa3a65
commit 95abe1aac2
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/reader/models.py
View file

@ -109,10 +109,7 @@ class UserSubscription(models.Model):
code = 1
message = ""
if us and not subscription_created:
code = -3
message = "You are already subscribed to this site."
elif us:
if us:
user_sub_folders_object, created = UserSubscriptionFolders.objects.get_or_create(
user=user,
defaults={'folders': '[]'}
@ -130,7 +127,6 @@ class UserSubscription(models.Model):
if feed.last_update < datetime.datetime.utcnow() - datetime.timedelta(days=1):
feed.update()
print code, message, us
return code, message, us
def mark_feed_read(self):

2
utils/feed_functions.py
View file

@ -160,7 +160,7 @@ 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:
if f_k == folder and obj not in f_v:
f_v.append(obj)
folders[k][f_k] = add_object_to_folder(obj, folder, f_v)
return folders