# HG changeset patch # User neko259 # Date 2014-01-07 13:52:39 # Node ID 3cc935feff730bcc2a673a07d4c8a3cbcc499770 # Parent 0e717b221f7467aef607366adb77e501658ad883 Moved get_post to an API views module diff --git a/boards/urls.py b/boards/urls.py --- a/boards/urls.py +++ b/boards/urls.py @@ -1,7 +1,7 @@ from django.conf.urls import patterns, url, include from boards import views from boards.rss import AllThreadsFeed, TagThreadsFeed, ThreadPostsFeed -from boards.views.api import api_get_threaddiff +from boards.views.api import api_get_threaddiff, get_post js_info_dict = { 'packages': ('boards',), @@ -57,7 +57,7 @@ urlpatterns = patterns('', url(r'^jsi18n/$', 'boards.views.cached_js_catalog', js_info_dict, name='js_info_dict'), # API - url(r'^api/post/(?P\w+)/$', views.get_post, name="get_post"), + url(r'^api/post/(?P\w+)/$', get_post, name="get_post"), url(r'^api/diff_thread/(?P\w+)/(?P\w+)/$', api_get_threaddiff, name="get_thread_diff"), ) diff --git a/boards/views/__init__.py b/boards/views/__init__.py --- a/boards/views/__init__.py +++ b/boards/views/__init__.py @@ -1,6 +1,8 @@ from datetime import datetime, timedelta + from django.db.models import Count + OLD_USER_AGE_DAYS = 90 __author__ = 'neko259' @@ -454,20 +456,6 @@ def api_get_post(request, post_id): return HttpResponse(content=json) -def get_post(request, post_id): - """Get the html of a post. Used for popups.""" - - post = get_object_or_404(Post, id=post_id) - thread = post.thread_new - - context = RequestContext(request) - context["post"] = post - context["can_bump"] = thread.can_bump() - if "truncated" in request.GET: - context["truncated"] = True - - return render(request, 'boards/post.html', context) - @cache_page(86400) def cached_js_catalog(request, domain='djangojs', packages=None): return javascript_catalog(request, domain, packages) diff --git a/boards/views/api.py b/boards/views/api.py --- a/boards/views/api.py +++ b/boards/views/api.py @@ -2,11 +2,12 @@ from datetime import datetime import json from django.db import transaction from django.http import HttpResponse -from django.shortcuts import get_object_or_404 +from django.shortcuts import get_object_or_404, render +from django.template import RequestContext from django.utils import timezone from boards.forms import ThreadForm, PlainErrorList from boards.models import Post -from boards.views import get_post, _datetime_to_epoch, _new_post, \ +from boards.views import _datetime_to_epoch, _new_post, \ _ban_current_user __author__ = 'neko259' @@ -73,3 +74,16 @@ def api_get_threaddiff(request, thread_i # } # # return HttpResponse(content=json.dumps(response)) +def get_post(request, post_id): + """Get the html of a post. Used for popups.""" + + post = get_object_or_404(Post, id=post_id) + thread = post.thread_new + + context = RequestContext(request) + context["post"] = post + context["can_bump"] = thread.can_bump() + if "truncated" in request.GET: + context["truncated"] = True + + return render(request, 'boards/post.html', context) \ No newline at end of file