scratchfoundation/s2forums
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: feeds expect to recive array, but they passed id. Tnx Igor Yanchenko

Browse source
This commit is contained in:
slav0nic 2011-04-05 10:58:06 +03:00
parent b5dd079f62
commit fb709fb224
2 changed files with 9 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

18
djangobb/djangobb_forum/feeds.py
View file

@ -64,10 +64,8 @@ class LastPostsOnTopic(ForumFeed):
title_template = 'forum/feeds/posts_title.html'
description_template = 'forum/feeds/posts_description.html'
def get_object(self, request, topics):
if len(topics) != 1:
raise ObjectDoesNotExist
topic = Topic.objects.get(id=topics[0])
def get_object(self, request, topic_id):
topic = Topic.objects.get(id=topic_id)
if not topic.forum.category.has_access(request.user):
raise Http404
return topic
@ -91,10 +89,8 @@ class LastPostsOnForum(ForumFeed):
title_template = 'forum/feeds/posts_title.html'
description_template = 'forum/feeds/posts_description.html'
def get_object(self, request, forums):
if len(forums) != 1:
raise ObjectDoesNotExist
forum = Forum.objects.get(id=forums[0])
def get_object(self, request, forum_id):
forum = Forum.objects.get(id=forum_id)
if not forum.category.has_access(request.user):
raise Http404
return forum
@ -118,10 +114,8 @@ class LastPostsOnCategory(ForumFeed):
title_template = 'forum/feeds/posts_title.html'
description_template = 'forum/feeds/posts_description.html'
def get_object(self, request, categories):
if len(categories) != 1:
raise ObjectDoesNotExist
category = Category.objects.get(id=categories[0])
def get_object(self, request, category_id):
category = Category.objects.get(id=category_id)
if not category.has_access(request.user):
raise Http404
return category

6
djangobb/djangobb_forum/urls.py
View file

@ -44,9 +44,9 @@ urlpatterns = patterns('',
# Feeds
url(r'^feeds/posts/$', LastPosts(), name='forum_posts_feed'),
url(r'^feeds/topics/$', LastTopics(), name='forum_topics_feed'),
url(r'^feeds/topic/(?P<topics>\d+)/$', LastPostsOnTopic(), name='forum_topic_feed'),
url(r'^feeds/forum/(?P<forums>\d+)/$', LastPostsOnForum(), name='forum_forum_feed'),
url(r'^feeds/category/(?P<categories>\d+)/$', LastPostsOnCategory(), name='forum_category_feed'),
url(r'^feeds/topic/(?P<topic_id>\d+)/$', LastPostsOnTopic(), name='forum_topic_feed'),
url(r'^feeds/forum/(?P<forum_id>\d+)/$', LastPostsOnForum(), name='forum_forum_feed'),
url(r'^feeds/category/(?P<category_id>\d+)/$', LastPostsOnCategory(), name='forum_category_feed'),
)
### EXTENSIONS ###