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

raise 404 when topic does't exist

Browse source
This commit is contained in:
slav0nic 2009-06-30 10:02:33 +03:00
parent c69b9ca936
commit 0c48d8ed90
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
apps/forum/views.py
View file

@ -263,7 +263,7 @@ def misc(request):
@render_to('forum/forum.html')
@paged('topics', forum_settings.FORUM_PAGE_SIZE)
def show_forum(request, forum_id, full=True):
forum = Forum.objects.get(pk=forum_id)
forum = get_object_or_404(Forum, pk=forum_id)
if not forum.category.has_access(request.user):
return HttpResponseForbidden()
topics = forum.topics.order_by('-sticky', '-updated').select_related()
@ -293,7 +293,7 @@ def show_forum(request, forum_id, full=True):
@render_to('forum/topic.html')
@paged('posts', forum_settings.TOPIC_PAGE_SIZE)
def show_topic(request, topic_id, full=True):
topic = Topic.objects.select_related().get(pk=topic_id)
topic = get_object_or_404(Topic.objects.select_related(), pk=topic_id)
if not topic.forum.category.has_access(request.user):
return HttpResponseForbidden()
topic.views += 1

2
static/forum/js/markitup/sets/default/set.js
View file

@ -21,7 +21,7 @@ mySettings = {
{name:'Picture', key:'P', replaceWith:'<img src="[![Source:!:http://]!]" alt="[![Alternative text]!]" />' },
{name:'Link', key:'L', openWith:'<a href="[![Link:!:http://]!]"(!( title="[![Title]!]")!)>', closeWith:'</a>', placeHolder:'Your text to link...' },
{separator:'---------------' },
{name:'Clean', className:'clean', replaceWith:function(markitup) { return markitup.selection.replace(/<(.*?)>/g, "") } },
{name:'Clean', className:'clean', replaceWith:function(markitup) { return markitup.selection.replace(/<(.*?)>/g, "") } },
{name:'Preview', className:'preview', call:'preview'}
]
}