Use own search form and view

boards/views/search.py

@@ -0,0 +1,32 b''
+from django.shortcuts import render
+from django.template import RequestContext
+from django.views.generic import View
+from haystack.query import SearchQuerySet
+from boards.abstracts.paginator import get_paginator
+from boards.forms import SearchForm, PlainErrorList
+
+__author__ = 'neko259'
+
+TEMPLATE = 'search/search.html'
+
+
+class BoardSearchView(View):
+    def get(self, request):
+        context = RequestContext(request)
+        form = SearchForm(request.GET, error_class=PlainErrorList)
+        context['form'] = form
+
+        if form.is_valid():
+            query = form.cleaned_data['query']
+            if len(query) >= 3:
+                results = SearchQuerySet().auto_query(query).order_by('-id') \
+                    .highlight()
+                paginator = get_paginator(results, 10)
+
+                if 'page' in request.GET:
+                    page = int(request.GET['page'])
+                else:
+                    page = 1
+                context['page'] = paginator.page(page)
+
+        return render(request, TEMPLATE, context)
  No newline at end of file

boards/forms.py

@@ -29,6 +29,7 b" ERROR_IMAGE_DUPLICATE = _('Such image wa"
 LABEL_TITLE = _('Title')
 LABEL_TEXT = _('Text')
 LABEL_TAG = _('Tag')
+LABEL_SEARCH = _('Search')
 
 TAG_MAX_LENGTH = 20
 
@@ -349,3 +350,6 b' class AddTagForm(NeboardForm):'
 
         return cleaned_data
 
+
+class SearchForm(NeboardForm):
+    query = forms.CharField(max_length=500, label=LABEL_SEARCH, required=False)
  No newline at end of file

boards/models/post.py

@@ -113,7 +113,7 b' class PostManager(models.Manager):'
         thread = post.get_thread()
 
         if post.is_opening():
-            thread.delete_with_posts()
+            thread.delete()
         else:
             thread.last_edit_time = timezone.now()
             thread.save()

boards/models/thread.py

@@ -32,7 +32,7 b' class ThreadManager(models.Manager):'
                 if settings.ARCHIVE_THREADS:
                     self._archive_thread(thread)
                 else:
-                    self._delete_thread(thread)
+                    thread.delete()
 
             logger.info('Processed %d old threads' % num_threads_to_delete)
 
@@ -41,9 +41,6 b' class ThreadManager(models.Manager):'
         thread.last_edit_time = timezone.now()
         thread.save(update_fields=['archived', 'last_edit_time'])
 
-    def _delete_thread(self, thread):
-        thread.delete_with_posts()
-
 
 class Thread(models.Model):
     objects = ThreadManager()
@@ -98,17 +95,6 b' class Thread(models.Model):'
 
         return post_count < settings.MAX_POSTS_PER_THREAD
 
-    # TODO Do it in the 'delete' method
-    def delete_with_posts(self):
-        """
-        Completely deletes thread and all its posts
-        """
-
-        if self.replies.exists():
-            self.replies.all().delete()
-
-        self.delete()
-
     def get_last_replies(self):
         """
         Gets several last replies, not including opening post
@@ -194,3 +180,9 b' class Thread(models.Model):'
         """
 
         return self.get_opening_post().pub_time
+
+    def delete(self, using=None):
+        if self.replies.exists():
+            self.replies.all().delete()
+
+        super(Thread, self).delete(using)
  No newline at end of file

boards/templates/boards/base.html

@@ -47,7 +47,7 b''
 <div class="navigation_panel">
     {% block metapanel %}{% endblock %}
     [<a href="{% url "login" %}">{% trans 'Login' %}</a>]
-    [<a href="{% url "haystack_search" %}">{% trans 'Search' %}</a>]
+    [<a href="{% url "search" %}">{% trans 'Search' %}</a>]
     {% with ppd=posts_per_day|floatformat:2 %}
         {% blocktrans %}Speed: {{ ppd }} posts per day{% endblocktrans %}
     {% endwith %}

boards/templates/search/search.html

@@ -5,18 +5,21 b''
 
 {% block content %}
     <div class="post-form-w">
-        <h3>{% trans 'Search' %}</h3>
-        <form method="get" action="">
-            {{ form.as_p }}
-            <input type="submit" value="{% trans 'Search' %}">
-        </form>
+        <div class="post-form">
+            <h3>{% trans 'Search' %}</h3>
+            <form method="get" action="">
+                {{ form.as_div }}
+                <div class="form-submit">
+                    <input type="submit" value="{% trans 'Search' %}">
+                </div>
+            </form>
+        </div>
     </div>
 
-    {% if query %}
+    {% if page %}
         {% if page.has_previous %}
             <div class="page_link">
-            <a href="?q={{ query }}&amp;page={{ page.previous_page_number }}">
-            {% trans "Previous page" %}
+            <a href="?query={{ query }}&amp;page={{ page.previous_page_number }}">{% trans "Previous page" %}
             </a>
             </div>
         {% endif %}
@@ -29,8 +32,7 b''
 
         {% if page.has_next %}
             <div class="page_link">
-                <a href="?q={{ query }}&amp;page={{ page.next_page_number }}">
-                    {% trans "Next page" %}
+                <a href="?query={{ query }}&amp;page ={{ page.next_page_number }}">{% trans "Next page" %}
                 </a>
             </div>
         {% endif %}

boards/tests.py

@@ -57,7 +57,7 b' class PostTests(TestCase):'
         thread = opening_post.get_thread()
         reply = Post.objects.create_post("", "", thread=thread)
 
-        thread.delete_with_posts()
+        thread.delete()
 
         self.assertFalse(Post.objects.filter(id=reply.id).exists())
 

boards/urls.py

@@ -6,6 +6,7 b' from boards.views import api, tag_thread'
 from boards.views.authors import AuthorsView
 from boards.views.delete_post import DeletePostView
 from boards.views.ban import BanUserView
+from boards.views.search import BoardSearchView
 from boards.views.static import StaticPageView
 from boards.views.post_admin import PostAdminView
 
@@ -77,6 +78,6 b" urlpatterns = patterns('',"
             name='add_post'),
 
     # Search
-    url(r'^search/', include('haystack.urls')),
+    url(r'^search/$', BoardSearchView.as_view(), name='search'),
 
 )

boards/views/all_threads.py

@@ -10,7 +10,6 b' from boards.models import Post, Thread, '
 from boards.views.banned import BannedView
 from boards.views.base import BaseBoardView, PARAMETER_FORM
 from boards.views.posting_mixin import PostMixin
-import neboard
 
 TAG_DELIMITER = ' '