Added tag search. Refactored search to show any model results in a list.

boards/models/base.py

@@ -0,0 +1,10 b''
+__author__ = 'neko259'
+
+
+class Viewable():
+    def __init__(self):
+        pass
+
+    def get_view(self, *args, **kwargs):
+        """Get an HTML view for a model"""
+        pass
  No newline at end of file

boards/models/post.py

@@ -10,10 +10,12 b' import hashlib'
 from django.core.cache import cache
 from django.core.urlresolvers import reverse
 from django.db import models, transaction
+from django.template.loader import render_to_string
 from django.utils import timezone
 from markupfield.fields import MarkupField
+from boards.models.base import Viewable
+
 from boards.models.thread import Thread
-
 from neboard import settings
 from boards import thumbs
 
@@ -193,7 +195,7 b' class PostManager(models.Manager):'
         return ppd
 
 
-class Post(models.Model):
+class Post(models.Model, Viewable):
     """A post is a message."""
 
     objects = PostManager()
@@ -357,4 +359,38 b' class Post(models.Model):'
         return self.thread_new
 
     def get_referenced_posts(self):
-        return self.referenced_posts.only('id', 'thread_new')
  No newline at end of file
+        return self.referenced_posts.only('id', 'thread_new')
+
+    def get_text(self):
+        return self.text
+
+    def get_view(self, moderator=False, need_open_link=False,
+                 truncated=False, *args, **kwargs):
+        if 'is_opening' in kwargs:
+            is_opening = kwargs['is_opening']
+        else:
+            is_opening = self.is_opening()
+
+        if 'thread' in kwargs:
+            thread = kwargs['thread']
+        else:
+            thread = self.get_thread()
+
+        if 'can_bump' in kwargs:
+            can_bump = kwargs['can_bump']
+        else:
+            can_bump = thread.can_bump()
+
+        opening_post_id = thread.get_opening_post_id()
+
+        return render_to_string('boards/post.html', {
+            'post': self,
+            'moderator': moderator,
+            'is_opening': is_opening,
+            'thread': thread,
+            'bumpable': can_bump,
+            'need_open_link': need_open_link,
+            'truncated': truncated,
+            'opening_post_id': opening_post_id,
+        })
+

boards/models/tag.py

@@ -1,6 +1,9 b''
+from django.template.loader import render_to_string
 from boards.models import Thread, Post
 from django.db import models
 from django.db.models import Count, Sum
+from django.core.urlresolvers import reverse
+from boards.models.base import Viewable
 
 __author__ = 'neko259'
 
@@ -26,7 +29,7 b' class TagManager(models.Manager):'
         return tags
 
 
-class Tag(models.Model):
+class Tag(models.Model, Viewable):
     """
     A tag is a text node assigned to the thread. The tag serves as a board
     section. There can be multiple tags for each thread
@@ -126,3 +129,11 b' class Tag(models.Model):'
             posts_count = 0
 
         return posts_count
+
+    def get_url(self):
+        return reverse('tag', kwargs={'tag_name': self.name})
+
+    def get_view(self, *args, **kwargs):
+        return render_to_string('boards/tag.html', {
+            'tag': self,
+        })
  No newline at end of file

boards/search_indexes.py

@@ -1,5 +1,5 b''
 from haystack import indexes
-from boards.models import Post
+from boards.models import Post, Tag
 
 __author__ = 'neko259'
 
@@ -11,4 +11,14 b' class PostIndex(indexes.SearchIndex, ind'
         return Post
 
     def index_queryset(self, using=None):
-        return self.get_model().objects.all()
  No newline at end of file
+        return self.get_model().objects.all()
+
+
+class TagIndex(indexes.SearchIndex, indexes.Indexable):
+    text = indexes.CharField(document=True, use_template=True)
+
+    def get_model(self):
+        return Tag
+
+    def index_queryset(self, using=None):
+        return self.get_model().objects.get_not_empty_tags()

boards/templates/boards/tag.html

@@ -1,96 +1,3 b''
-{% load i18n %}
-{% load board %}
-{% load cache %}
-
-{% get_current_language as LANGUAGE_CODE %}
-
-{% spaceless %}
-    {% cache 600 post post.id post.last_edit_time thread.archived bumpable truncated moderator LANGUAGE_CODE need_open_link %}
-        {% if thread.archived %}
-            <div class="post archive_post" id="{{ post.id }}">
-        {% elif bumpable %}
-            <div class="post" id="{{ post.id }}">
-        {% else %}
-            <div class="post dead_post" id="{{ post.id }}">
-        {% endif %}
-
-        <div class="post-info">
-            <a class="post_id" href="{% post_object_url post thread=thread %}"
-                {% if not truncated and not thread.archived %}
-                    onclick="javascript:addQuickReply('{{ post.id }}'); return false;"
-                    title="{% trans 'Quote' %}"
-                {% endif %}
-                >({{ post.id }}) </a>
-            <span class="title">{{ post.title }} </span>
-            <span class="pub_time">{{ post.pub_time }}</span>
-            {% if thread.archived %}
-                — {{ thread.bump_time }}
-            {% endif %}
-            {% if is_opening and need_open_link %}
-                {% if thread.archived %}
-                    [<a class="link" href="{% url 'thread' post.id %}">{% trans "Open" %}</a>]
-                {% else %}
-                    [<a class="link" href="{% url 'thread' post.id %}#form">{% trans "Reply" %}</a>]
-                {% endif %}
-            {% endif %}
-
-            {% if moderator %}
-                <span class="moderator_info">
-                    [<a href="{% url 'post_admin' post_id=post.id %}"
-                        >{% trans 'Edit' %}</a>]
-                    [<a href="{% url 'delete' post_id=post.id %}"
-                        >{% trans 'Delete' %}</a>]
-                    ({{ post.poster_ip }})
-                    [<a href="{% url 'ban' post_id=post.id %}?next={{ request.path }}"
-                        >{% trans 'Ban IP' %}</a>]
-                </span>
-            {% endif %}
-        </div>
-        {% if post.image %}
-            <div class="image">
-                <a
-                        class="thumb"
-                        href="{{ post.image.url }}"><img
-                        src="{{ post.image.url_200x150 }}"
-                        alt="{{ post.id }}"
-                        width="{{ post.image_pre_width }}"
-                        height="{{ post.image_pre_height }}"
-                        data-width="{{ post.image_width }}"
-                        data-height="{{ post.image_height }}"/>
-                </a>
-            </div>
-        {% endif %}
-        <div class="message">
-            {% autoescape off %}
-                {% if truncated %}
-                    {{ post.text.rendered|truncatewords_html:50 }}
-                {% else %}
-                    {{ post.text.rendered }}
-                {% endif %}
-            {% endautoescape %}
-            {% if post.is_referenced %}
-                <div class="refmap">
-                    {% autoescape off %}
-                        {% trans "Replies" %}: {{ post.refmap }}
-                    {% endautoescape %}
-                </div>
-            {% endif %}
-        </div>
-    {% endcache %}
-        {% if is_opening %}
-        {% cache 600 post_thread thread.id thread.last_edit_time LANGUAGE_CODE need_open_link %}
-            <div class="metadata">
-                {% if is_opening and need_open_link %}
-                    {{ thread.get_images_count }} {% trans 'images' %}.
-                {% endif %}
-                <span class="tags">
-                    {% for tag in thread.get_tags %}
-                        <a class="tag" href="{% url 'tag' tag.name %}">
-                            #{{ tag.name }}</a>{% if not forloop.last %},{% endif %}
-                    {% endfor %}
-                </span>
-            </div>
-        {% endcache %}
-        {% endif %}
-        </div>
-{% endspaceless %}
+<div class="post">
+    <a class="tag" href="{% url 'tag' tag_name=tag.name %}">#{{ tag.name }}</a>
+</div>
  No newline at end of file

boards/templatetags/board.py

@@ -1,8 +1,7 b''
 from django.shortcuts import get_object_or_404
-from boards.models import Post
-from boards.views import thread, api
 from django import template
 
+
 register = template.Library()
 
 actions = [
@@ -21,7 +20,7 b' actions = ['
 def post_url(*args, **kwargs):
     post_id = args[0]
 
-    post = get_object_or_404(Post, id=post_id)
+    post = get_object_or_404('Post', id=post_id)
 
     return post.get_url()
 
@@ -53,6 +52,7 b' def image_actions(*args, **kwargs):'
     return result
 
 
+# TODO Use get_view of a post instead of this
 @register.inclusion_tag('boards/post.html', name='post_view')
 def post_view(post, moderator=False, need_open_link=False, truncated=False,
               **kwargs):

requirements.txt

@@ -1,3 +1,4 b''
+haystack
 pillow
 django>=1.6
 django_cleanup

templates/search/indexes/boards/tag_text.txt

@@ -1,2 +1,1 b''
-{{ object.title }}
-{{ object.text }}
  No newline at end of file
+{{ object.name }}
  No newline at end of file

templates/search/search.html

@@ -14,9 +14,9 b''
 
     {% if query %}
         {% for result in page.object_list %}
-            {% post_view result.object %}
+            {{ result.object.get_view }}
         {% empty %}
-            <p>{% trans 'No results found.' %}</p>
+            <div class="post">{% trans 'No results found.' %}</div>
         {% endfor %}
 
         {% if page.has_previous or page.has_next %}