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

Fixing classifier dialog's saving calls. Also adding debug information for refresh_feeds to find out how much the status pinging is taking.

Browse source
This commit is contained in:
Samuel Clay 2011-03-08 10:06:55 -05:00
parent 0062cef1e6
commit c1a5a55f0d
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/reader/views.py
View file

@ -225,6 +225,7 @@ def load_feeds_iphone(request):
@json.json_view
def refresh_feeds(request):
start = datetime.datetime.utcnow()
user = get_user(request)
feeds = {}
user_subs = UserSubscription.objects.select_related('feed').filter(user=user, active=True)
@ -253,10 +254,15 @@ def refresh_feeds(request):
feeds[sub.feed.pk]['favicon_color'] = sub.feed.icon.color
feeds[sub.feed.pk]['favicon_fetching'] = bool(not (sub.feed.icon.not_found or sub.feed.icon.data))
diff = datetime.datetime.utcnow()-start
timediff = float("%s.%.2s" % (diff.seconds, (diff.microseconds / 1000)))
logging.user(request.user, "~FBRefreshing (%s seconds)" % (timediff))
return {'feeds': feeds}
@json.json_view
def load_single_feed(request):
start = datetime.datetime.utcnow()
user = get_user(request)
offset = int(request.REQUEST.get('offset', 0))
limit = int(request.REQUEST.get('limit', 30))
@ -286,7 +292,6 @@ def load_single_feed(request):
force_update = request.GET.get('force_update', False)
start = datetime.datetime.utcnow()
stories = feed.get_stories(offset, limit)
if force_update:

6
media/js/newsblur/reader_classifier.js
View file

@ -765,7 +765,7 @@ var classifier_prototype = {
});
$.targetIs(e, { tagSelector: '.NB-modal-submit-save.NB-modal-submit-next' }, function($t, $p){
e.preventDefault();
self.save_publisher(true);
self.save(true);
self.load_next_feed_in_trainer();
self.update_homepage_counts();
});
@ -782,7 +782,7 @@ var classifier_prototype = {
$.targetIs(e, { tagSelector: '.NB-modal-submit-close' }, function($t, $p){
e.preventDefault();
self.save_publisher();
self.save();
});
$.targetIs(e, { tagSelector: '.NB-modal-submit-end' }, function($t, $p){
@ -795,7 +795,7 @@ var classifier_prototype = {
} else {
$.targetIs(e, { tagSelector: '.NB-modal-submit-save:not(.NB-modal-submit-next)' }, function($t, $p){
e.preventDefault();
self.save_publisher();
self.save();
return false;
});
}