Changeset 345:b699542a7889


Ignore:
Timestamp:
Apr 5, 2011 11:58:06 AM (2 years ago)
Author:
slav0nic <slav0nic0@…>
Branch:
default
Message:

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

Location:
djangobb/djangobb_forum
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • djangobb/djangobb_forum/feeds.py

    r307 r345  
    6565    description_template = 'forum/feeds/posts_description.html' 
    6666     
    67     def get_object(self, request, topics): 
    68         if len(topics) != 1: 
    69             raise ObjectDoesNotExist 
    70         topic = Topic.objects.get(id=topics[0]) 
     67    def get_object(self, request, topic_id): 
     68        topic = Topic.objects.get(id=topic_id) 
    7169        if not topic.forum.category.has_access(request.user): 
    7270            raise Http404 
    … …  
    9290    description_template = 'forum/feeds/posts_description.html' 
    9391 
    94     def get_object(self, request, forums): 
    95         if len(forums) != 1: 
    96             raise ObjectDoesNotExist 
    97         forum = Forum.objects.get(id=forums[0]) 
     92    def get_object(self, request, forum_id): 
     93        forum = Forum.objects.get(id=forum_id) 
    9894        if not forum.category.has_access(request.user): 
    9995            raise Http404 
    … …  
    119115    description_template = 'forum/feeds/posts_description.html' 
    120116     
    121     def get_object(self, request, categories): 
    122         if len(categories) != 1: 
    123             raise ObjectDoesNotExist 
    124         category = Category.objects.get(id=categories[0]) 
     117    def get_object(self, request, category_id): 
     118        category = Category.objects.get(id=category_id) 
    125119        if not category.has_access(request.user): 
    126120            raise Http404 

  • djangobb/djangobb_forum/urls.py

    r279 r345  
    4545    url(r'^feeds/posts/$', LastPosts(), name='forum_posts_feed'), 
    4646    url(r'^feeds/topics/$', LastTopics(), name='forum_topics_feed'), 
    47     url(r'^feeds/topic/(?P<topics>\d+)/$', LastPostsOnTopic(), name='forum_topic_feed'), 
    48     url(r'^feeds/forum/(?P<forums>\d+)/$', LastPostsOnForum(), name='forum_forum_feed'), 
    49     url(r'^feeds/category/(?P<categories>\d+)/$', LastPostsOnCategory(), name='forum_category_feed'), 
     47    url(r'^feeds/topic/(?P<topic_id>\d+)/$', LastPostsOnTopic(), name='forum_topic_feed'), 
     48    url(r'^feeds/forum/(?P<forum_id>\d+)/$', LastPostsOnForum(), name='forum_forum_feed'), 
     49    url(r'^feeds/category/(?P<category_id>\d+)/$', LastPostsOnCategory(), name='forum_category_feed'), 
    5050) 
    5151 
Note: See TracChangeset for help on using the changeset viewer.