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

Attempting a fix for feed url changes not sticking.

Browse source
This commit is contained in:
Samuel Clay 2015-08-12 14:43:11 -07:00
parent 35a7d2de09
commit 622d0814d6
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/rss_feeds/views.py
View file

@ -311,8 +311,9 @@ def exception_change_feed_address(request):
new_feed.schedule_feed_fetch_immediately()
new_feed.has_feed_exception = False
new_feed.active = True
new_feed.save()
merge_feeds(new_feed.pk, feed.pk)
new_feed = new_feed.save()
if new_feed.pk != feed.pk:
merge_feeds(new_feed.pk, feed.pk)
else:
# Branch good feed
logging.user(request, "~FRBranching feed by address: ~SB%s~SN to ~SB%s" % (feed.feed_address, feed_address))
@ -324,7 +325,7 @@ def exception_change_feed_address(request):
except Feed.DoesNotExist:
feed.branch_from_feed = original_feed
feed.feed_address_locked = True
feed.save()
feed = feed.save()
feed = feed.update()
feed = Feed.get_by_id(feed.pk)