# HG changeset patch # User neko259 # Date 2013-11-23 20:08:03 # Node ID f1273caef9eaed9a84829379fdf4952c9124909c # Parent dc1ea3c1faad55e56c7b2cc0700a634c126f9bc7 Fixed RSS diff --git a/boards/models/post.py b/boards/models/post.py --- a/boards/models/post.py +++ b/boards/models/post.py @@ -289,4 +289,7 @@ class Thread(models.Model): return self.get_replies()[0] def __unicode__(self): - return str(self.get_replies()[0].id) \ No newline at end of file + return str(self.get_replies()[0].id) + + def get_pub_time(self): + return self.get_opening_post().pub_time \ No newline at end of file diff --git a/boards/rss.py b/boards/rss.py --- a/boards/rss.py +++ b/boards/rss.py @@ -15,7 +15,7 @@ class AllThreadsFeed(Feed): description_template = 'boards/rss/post.html' def items(self): - return Post.objects.get_threads(order_by='-pub_time') + return Post.objects.get_threads() # TODO Order this by OP's pub time def item_title(self, item): return item.get_opening_post().title @@ -33,8 +33,7 @@ class TagThreadsFeed(Feed): description_template = 'boards/rss/post.html' def items(self, obj): - return Post.objects.get_threads(tag=obj, - order_by='-pub_time') + return Post.objects.get_threads(tag=obj) # TODO Order this by OP's pub time def get_object(self, request, tag_name): return get_object_or_404(Tag, name=tag_name) @@ -46,7 +45,7 @@ class TagThreadsFeed(Feed): return reverse('thread', args={item.get_opening_post().id}) def item_pubdate(self, item): - return item.pub_time + return item.get_pub_time() def title(self, obj): return obj.name @@ -67,8 +66,8 @@ class ThreadPostsFeed(Feed): return item.title def item_link(self, item): - if item.thread: - return reverse('thread', args={item.thread.get_opening_post() + if not item.is_opening(): + return reverse('thread', args={item.thread_new.get_opening_post() .id}) + "#" + str(item.id) else: return reverse('thread', args={item.id}) diff --git a/boards/templates/boards/thread.html b/boards/templates/boards/thread.html --- a/boards/templates/boards/thread.html +++ b/boards/templates/boards/thread.html @@ -6,7 +6,7 @@ {% load board %} {% block head %} - Neboard - {{ posts.0.get_title }} + Neboard - {{ thread.get_replies.0.get_title }} {% endblock %} {% block content %} @@ -15,7 +15,7 @@ - {% cache 600 thread_view thread.last_edit_time moderator LANGUAGE_CODE %} + {% cache 600 thread_view thread.id thread.last_edit_time moderator LANGUAGE_CODE %} {% if bumpable %}