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

Mark All as Read fixed.

Browse source
This commit is contained in:
Samuel Clay 2009-09-08 04:37:38 +00:00
parent 4f41567628
commit 5185da7b16
3 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/reader/models.py
View file

@ -57,8 +57,8 @@ class UserSubscription(models.Model):
self.unread_count = 0
self.unread_count_updated = datetime.datetime.now()
self.save()
readstories = ReadStories.objects.filter(user=self.user, feed=self.feed)
readstories.delete()
# readstories = ReadStories.objects.filter(user=self.user, feed=self.feed)
# readstories.delete()
def stories_newer_lastread(self):
return self.feed.new_stories_since_date(self.last_read_date)

15
apps/reader/views.py
View file

@ -173,16 +173,19 @@ def mark_story_as_read(request):
def mark_feed_as_read(request):
feed_id = int(request.REQUEST['feed_id'])
feed = Feed.objects.get(id=feed_id)
code = 0
us = UserSubscription.objects.get(feed=feed, user=request.user)
us.mark_feed_read()
UserStory.objects.filter(user=request.user, feed=feed_id).delete()
data = json.encode(dict(code=0))
try:
m.save()
us.mark_feed_read()
except IntegrityError, e:
data = json.encode(dict(code=1))
code = -1
else:
code = 1
data = json.encode(dict(code=code))
# UserStory.objects.filter(user=request.user, feed=feed_id).delete()
return HttpResponse(data)
@login_required

12
media/js/newsblur/reader.js
View file

@ -226,7 +226,7 @@
}
}
var feed_id = $('.feed_id', $next_feed).text();
var feed_id = $next_feed.data('feed_id');
if (feed_id) {
var position = this.$feed_list.scrollTop() + $next_feed.offset().top - $next_feed.outerHeight();
var showing = this.$feed_list.height();
@ -273,9 +273,8 @@
var $feed = $.make('div', { className: 'feed' }, [
$.make('span', { className: 'unread_count' }, ''+feeds[f].unread_count),
$.make('img', { className: 'feed_favicon', src: self.google_favicon_url + feeds[f].feed_link }),
$.make('span', { className: 'feed_title' }, feeds[f].feed_title),
$.make('span', { className: 'feed_id' }, ''+feeds[f].id)
]);
$.make('span', { className: 'feed_title' }, feeds[f].feed_title)
]).data('feed_id', feeds[f].id);
if (feeds[f].unread_count <= 0) {
$('.unread_count', $feed).css('display', 'none');
$feed.addClass('no_unread_items');
@ -911,12 +910,12 @@
$.targetIs(e, { tagSelector: '#feed_list .feed' }, function($t, $p){
e.preventDefault();
var feed_id = $('.feed_id', $t).text();
var feed_id = $t.data('feed_id');
self.open_feed(feed_id, $t);
});
$.targetIs(e, { tagSelector: 'a.mark_feed_as_read' }, function($t, $p){
e.preventDefault();
var feed_id = $t.attr('href').slice(1).split('/');
var feed_id = $t.data('feed_id');
self.mark_feed_as_read(feed_id, $t);
});
@ -981,6 +980,7 @@
$.targetIs(e, { tagSelector: '#feed_list .feed' }, function($t, $p){
e.preventDefault();
NEWSBLUR.log(['Feed dblclick', $('.feed_id', $t), $t]);
var feed_id = $t.data('feed_id');
self.open_feed_link(feed_id, $t);
});
},