From d9c142491f600c933e25f641573be17cf2c80e67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Fri, 22 Mar 2013 22:23:23 +0100 Subject: [PATCH] Removing unused search app --- greenmine/search/__init__.py | 0 greenmine/search/forms.py | 8 --- .../search/templates/search-results.html | 54 ------------------ greenmine/search/urls.py | 8 --- greenmine/search/views.py | 57 ------------------- greenmine/settings/common.py | 1 - 6 files changed, 128 deletions(-) delete mode 100644 greenmine/search/__init__.py delete mode 100644 greenmine/search/forms.py delete mode 100644 greenmine/search/templates/search-results.html delete mode 100644 greenmine/search/urls.py delete mode 100644 greenmine/search/views.py diff --git a/greenmine/search/__init__.py b/greenmine/search/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/greenmine/search/forms.py b/greenmine/search/forms.py deleted file mode 100644 index e0c66b68..00000000 --- a/greenmine/search/forms.py +++ /dev/null @@ -1,8 +0,0 @@ -# -* coding: utf-8 -*- -from haystack import forms - - -class SearchForm(forms.SearchForm): - def __init__(self, *args, **kwargs): - kwargs['load_all'] = True - super(SearchForm, self).__init__(*args, **kwargs) diff --git a/greenmine/search/templates/search-results.html b/greenmine/search/templates/search-results.html deleted file mode 100644 index 971a3bfd..00000000 --- a/greenmine/search/templates/search-results.html +++ /dev/null @@ -1,54 +0,0 @@ -{% extends 'base.html' %} -{% load static from staticfiles %} -{% load i18n %} -{% load rawinclude greenmine_utils %} - -{% block title %} - -{% trans "Search" %} -{% endblock %} - -{% block wrapper %} -

{% trans "Search Results" %}

- {% if page.object_list %} - - {% else %} -

{% trans "No results found." %}

- {% endif %} -{% endblock %} - -{% block top-headers %} - -{% endblock %} diff --git a/greenmine/search/urls.py b/greenmine/search/urls.py deleted file mode 100644 index 63834903..00000000 --- a/greenmine/search/urls.py +++ /dev/null @@ -1,8 +0,0 @@ -# -*- coding: utf-8 -*- -from django.conf.urls.defaults import patterns, url - -from greenmine.search.views import SearchView - -urlpatterns = patterns('', - url(r'^$', SearchView.as_view(), name='search'), -) diff --git a/greenmine/search/views.py b/greenmine/search/views.py deleted file mode 100644 index 5ccd5528..00000000 --- a/greenmine/search/views.py +++ /dev/null @@ -1,57 +0,0 @@ -# -*- coding: utf-8 -*- -from haystack.query import EmptySearchQuerySet - -from django.core.paginator import Paginator, InvalidPage -from django.conf import settings -from django.http import Http404 -from django.utils.translation import ugettext as _ - -from greenmine.base.decorators import login_required -from greenmine.base.generic import GenericView -from greenmine.scrum.models import Project -from greenmine.search.forms import SearchForm - - -SEARCH_RESULTS_PER_PAGE = getattr(settings, 'SEARCH_RESULTS_PER_PAGE', 20) - - -class SearchView(GenericView): - template_path = 'search-results.html' - - @login_required - def get(self, request): - query = '' - results = EmptySearchQuerySet() - - if request.user.is_staff: - projects = Project.objects.all() - else: - projects = request.user.projects.all() | \ - request.user.projects_participant.all() - - projects = projects.order_by('name').distinct() - - if request.GET.get('q'): - form = SearchForm(request.GET) - - if form.is_valid(): - query = form.cleaned_data['q'] - results = form.search().filter(project__in=projects) - else: - form = SearchForm() - - paginator = Paginator(results, SEARCH_RESULTS_PER_PAGE) - - try: - page = paginator.page(int(request.GET.get('page', 1))) - except InvalidPage: - raise Http404(_(u'No such page of results!')) - - context = { - 'form': form, - 'page': page, - 'paginator': paginator, - 'query': query, - } - - return self.render_to_response(self.template_path, context) diff --git a/greenmine/settings/common.py b/greenmine/settings/common.py index 4bb745c0..a99638ee 100644 --- a/greenmine/settings/common.py +++ b/greenmine/settings/common.py @@ -206,7 +206,6 @@ INSTALLED_APPS = [ 'greenmine.wiki', 'greenmine.documents', 'greenmine.questions', - 'greenmine.search', 'south', 'haystack',