Changeset 380:1d49a0460392

Timestamp:

Oct 11, 2011 2:35:07 PM (21 months ago)

Author:

slav0nic <slav0nic0@…>

Branch:

default

Message:

fix haystack search

Files:

• djangobb_forum/templates/djangobb_forum/search_posts.html (modified) (2 diffs)
• djangobb_forum/views.py (modified) (1 diff)
• extras/requirements.txt (modified) (1 diff)

djangobb_forum/templates/djangobb_forum/search_posts.html

@@ -15 +15 @@
 {% for post in results %}
 <div class="blockpost searchposts roweven">
-        <h2>{% link post.instance.topic.forum %}&nbsp;&raquo;&nbsp;{% link post.instance.topic %}&nbsp;&raquo;&nbsp;<a href="{{ post.instance.get_absolute_url }}">{% forum_time post.instance.created %}</a></h2>
+        <h2>{% link post.object.topic.forum %}&nbsp;&raquo;&nbsp;{% link post.object.topic %}&nbsp;&raquo;&nbsp;<a href="{{ post.object.get_absolute_url }}">{% forum_time post.object.created %}</a></h2>
 
         <div class="box">
@@ -21 +21 @@
                         <div class="postleft">
                                 <dl>
-                                        <dt><strong><a href="{% url djangobb:forum_profile post.instance.user %}">{{ post.instance.user }}</a></strong></dt>
-                                        <dd>{% trans "Replies:" %} {{ post.instance.topic.post_count }}</dd>
+                                        <dt><strong><a href="{% url djangobb:forum_profile post.object.user %}">{{ post.object.user }}</a></strong></dt>
+                                        <dd>{% trans "Replies:" %} {{ post.object.topic.post_count }}</dd>
                                         <dd><div class="icon"><div class="nosize"><!-- --></div></div>
 </dd>
 
-                                        <dd><p class="clearb"><a href="{{ post.instance.get_absolute_url }}">{% trans "Go to post" %}</a></p></dd>
+                                        <dd><p class="clearb"><a href="{{ post.object.get_absolute_url }}">{% trans "Go to post" %}</a></p></dd>
                                 </dl>
                         </div>
                         <div class="postright">
                                 <div class="postmsg">
-                                        {{ post.instance.body_html|safe }}
+                                        {{ post.object.body_html|safe }}
 
                                 </div>

djangobb_forum/views.py

@@ -179 +179 @@
             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:

extras/requirements.txt

@@ -1 +1 @@
 Django>=1.2
 PIL>=1.1.7
-django-haystack>=1.1.0
+django-haystack>=1.2.5
 south
 django-messages==0.4.4