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

Possibly breaking the usersubscription dupe checker, but its gotta work for both river and feed loads.

Browse source
This commit is contained in:
Samuel Clay 2011-02-06 20:07:03 -05:00
parent 7892dbec33
commit c5a7514318
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
apps/reader/managers.py
View file

@ -7,9 +7,16 @@ class UserSubscriptionManager(models.Manager):
try: try:
return super(UserSubscriptionManager, self).get(*args, **kwargs) return super(UserSubscriptionManager, self).get(*args, **kwargs)
except: except:
dupe_feed = DuplicateFeed.objects.filter(duplicate_feed_id=kwargs['feed'].pk) if 'feed' in kwargs:
feed_id = kwargs['feed'].pk
elif 'feed__pk' in kwargs:
feed_id = kwargs['feed__pk']
dupe_feed = DuplicateFeed.objects.filter(duplicate_feed_id=feed_id)
if dupe_feed: if dupe_feed:
feed = dupe_feed[0].feed feed = dupe_feed[0].feed
kwargs['feed'] = feed if 'feed' in kwargs:
logging.debug(" ---> [%s] ~BRFound dupe UserSubscription: ~SB%s" % (kwargs['user'].username, kwargs['feed'])) kwargs['feed'] = feed
elif 'feed__pk' in kwargs:
kwargs['feed__pk'] = feed.pk
logging.debug(" ---> [%s] ~BRFound dupe UserSubscription: ~SB%s (%s)" % (kwargs['user'].username, feed, feed_id))
return super(UserSubscriptionManager, self).get(*args, **kwargs) return super(UserSubscriptionManager, self).get(*args, **kwargs)