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

Merging feeds, handling null story_guids

Browse source
This commit is contained in:
Samuel Clay 2010-09-10 01:09:28 -07:00
parent b26dfa87bb
commit 5e780b0438
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/rss_feeds/models.py
View file

@ -879,7 +879,8 @@ def merge_feeds(original_feed_id, duplicate_feed_id):
for user_story in user_stories:
user_story.feed_id = original_feed.pk
duplicate_story = user_story.story
original_story = MStory.objects(story_guid=duplicate_story.story_guid,
story_guid = getattr(duplicate_story, 'story_guid') or duplicate_story.id
original_story = MStory.objects(story_guid=story_guid,
story_feed_id=original_feed.pk)
if original_story: