diff --git a/djangobb_forum/templates/djangobb_forum/search_posts.html b/djangobb_forum/templates/djangobb_forum/search_posts.html index d769ef6..c938586 100644 --- a/djangobb_forum/templates/djangobb_forum/search_posts.html +++ b/djangobb_forum/templates/djangobb_forum/search_posts.html @@ -14,23 +14,23 @@ {% if results %} {% for post in results %}
-

{% link post.instance.topic.forum %} » {% link post.instance.topic %} » {% forum_time post.instance.created %}

+

{% link post.object.topic.forum %} » {% link post.object.topic %} » {% forum_time post.object.created %}

-
{{ post.instance.user }}
-
{% trans "Replies:" %} {{ post.instance.topic.post_count }}
+
{{ post.object.user }}
+
{% trans "Replies:" %} {{ post.object.topic.post_count }}
-

{% trans "Go to post" %}

+

{% trans "Go to post" %}

- {{ post.instance.body_html|safe }} + {{ post.object.body_html|safe }}
diff --git a/djangobb_forum/views.py b/djangobb_forum/views.py index 2d65011..cccde56 100644 --- a/djangobb_forum/views.py +++ b/djangobb_forum/views.py @@ -178,7 +178,7 @@ def search(request): if 'topics' in request.GET['show_as']: topics = [] - topics_to_exclude = [] + topics_to_exclude = SQ() for post in posts: if post.object.topic not in topics: if post.object.topic.forum.category.has_access(request.user): diff --git a/extras/requirements.txt b/extras/requirements.txt index 528839a..a0027ff 100644 --- a/extras/requirements.txt +++ b/extras/requirements.txt @@ -1,6 +1,6 @@ Django>=1.2 PIL>=1.1.7 -django-haystack>=1.1.0 +django-haystack>=1.2.5 south django-messages==0.4.4 pygments