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

Attempting to fix user exception dialogs.

Browse source
This commit is contained in:
Samuel Clay 2012-08-27 15:22:42 -07:00
parent 11a2f735a2
commit b2f771e53b
2 changed files with 45 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
apps/rss_feeds/views.py
View file

@ -210,8 +210,10 @@ def exception_retry(request):
logging.user(request, "~FRForcing refreshing feed: ~SB%s" % (feed))
feed.fetched_once = True
feed.save()
feed = feed.update(force=True, compute_scores=False, verbose=True)
feed = Feed.get_by_id(feed.pk)
try:
usersub = UserSubscription.objects.get(user=user, feed=feed)
except UserSubscription.DoesNotExist:
@ -223,7 +225,7 @@ def exception_retry(request):
return {'code': -1}
usersub.calculate_feed_scores(silent=False)
feeds = {feed.pk: usersub.canonical(full=True), feed_id: usersub.canonical(full=True)}
feeds = {feed.pk: usersub and usersub.canonical(full=True), feed_id: usersub.canonical(full=True)}
return {'code': 1, 'feeds': feeds}
@ -268,19 +270,24 @@ def exception_change_feed_address(request):
code = 1
feed = feed.update()
feed = Feed.objects.get(pk=feed.pk)
usersub = UserSubscription.objects.get(user=request.user, feed=original_feed)
if usersub:
usersub.switch_feed(feed, original_feed)
usersub = UserSubscription.objects.get(user=request.user, feed=feed)
feed = Feed.get_by_id(feed.pk)
try:
usersub = UserSubscription.objects.get(user=request.user, feed=feed)
except UserSubscription.DoesNotExist:
usersubs = UserSubscription.objects.filter(user=request.user, feed=original_feed)
if usersubs:
usersub = usersubs[0]
usersub.switch_feed(feed, original_feed)
else:
return {'code': -1}
usersub.calculate_feed_scores(silent=False)
feed.update_all_statistics()
classifiers = get_classifiers_for_user(usersub.user, feed_id=usersub.feed_id)
feeds = {
original_feed.pk: usersub.canonical(full=True, classifiers=classifiers),
original_feed.pk: usersub and usersub.canonical(full=True, classifiers=classifiers),
}
if feed and feed.has_feed_exception:
@ -335,12 +342,17 @@ def exception_change_feed_link(request):
code = 1
feed = feed.update()
feed = Feed.objects.get(pk=feed.pk)
feed = Feed.get_by_id(feed.pk)
usersub = UserSubscription.objects.get(user=request.user, feed=original_feed)
if usersub:
usersub.switch_feed(feed, original_feed)
usersub = UserSubscription.objects.get(user=request.user, feed=feed)
try:
usersub = UserSubscription.objects.get(user=request.user, feed=feed)
except UserSubscription.DoesNotExist:
usersubs = UserSubscription.objects.filter(user=request.user, feed=original_feed)
if usersubs:
usersub = usersubs[0]
usersub.switch_feed(feed, original_feed)
else:
return {'code': -1}
usersub.calculate_feed_scores(silent=False)

29
media/js/newsblur/reader/reader_feed_exception.js
View file

@ -270,12 +270,17 @@ _.extend(NEWSBLUR.ReaderFeedException.prototype, {
}, function(data) {
if (data.new_feed_id) {
NEWSBLUR.reader.force_feed_refresh(feed_id, data.new_feed_id);
$.modal.close();
} else {
$error.show().html((data && data.message) || "There was a problem fetching the feed from this URL.");
$loading.removeClass('NB-active');
$submit.removeClass('NB-disabled').attr('value', 'Parse this RSS/XML Feed');
}
var feed = NEWSBLUR.assets.get_feed(data.new_feed_id);
console.log(["feed address", feed, NEWSBLUR.assets.get_feed(feed_id)]);
var error = "There was a problem fetching the feed from this URL.";
if (parseInt(feed.get('exception_code'), 10) == 404) {
error = "URL gives a 404 - page not found.";
}
$error.show().html((data && data.message) || error);
$loading.removeClass('NB-active');
$submit.removeClass('NB-disabled').attr('value', 'Parse this RSS/XML Feed');
});
}
},
@ -299,12 +304,16 @@ _.extend(NEWSBLUR.ReaderFeedException.prototype, {
}, function(data) {
if (data.new_feed_id) {
NEWSBLUR.reader.force_feed_refresh(feed_id, data.new_feed_id);
$.modal.close();
} else {
$error.show().html((data && data.message) || "There was a problem fetching the feed from this URL.");
$loading.removeClass('NB-active');
$submit.removeClass('NB-disabled').attr('value', 'Fetch Feed from Website');
}
var feed = NEWSBLUR.assets.get_feed(data.new_feed_id);
var error = "There was a problem fetching the feed from this URL.";
if (feed.get('exception_code') == '404') {
error = "URL gives a 404 - page not found.";
}
$error.show().html((data && data.message) || error);
$loading.removeClass('NB-active');
$submit.removeClass('NB-disabled').attr('value', 'Fetch Feed from Website');
});
}
},