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

Merge branch 'master' into circular

Browse source 
* master:
  Fixing broken branch id in unicode/str for feed.
This commit is contained in:
Samuel Clay 2013-01-30 16:33:40 -08:00
commit fdc9f45a2b
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/rss_feeds/models.py
View file

@ -90,7 +90,7 @@ class Feed(models.Model):
self.num_subscribers,
self.active_subscribers,
self.premium_subscribers,
(" [B: %s]" % self.branch_from_feed if self.branch_from_feed else ""))
(" [B: %s]" % self.branch_from_feed.pk if self.branch_from_feed else ""))
@property
def title(self):
@ -1801,12 +1801,12 @@ def merge_feeds(original_feed_id, duplicate_feed_id, force=False):
original_feed.num_subscribers,
original_feed.feed_address,
original_feed.feed_link,
" [B: %s]" % original_feed.branch_from_feed if original_feed.branch_from_feed else ""))
" [B: %s]" % original_feed.branch_from_feed.pk if original_feed.branch_from_feed else ""))
logging.info(" Dupe --> %s: (%s subs) %s / %s %s" % (duplicate_feed.pk,
duplicate_feed.num_subscribers,
duplicate_feed.feed_address,
duplicate_feed.feed_link,
" [B: %s]" % duplicate_feed.branch_from_feed if duplicate_feed.branch_from_feed else ""))
" [B: %s]" % duplicate_feed.branch_from_feed.pk if duplicate_feed.branch_from_feed else ""))
user_subs = UserSubscription.objects.filter(feed=duplicate_feed).order_by('-pk')
for user_sub in user_subs: