From 59f86ae040a16ca92a25272069bd03b6dd31d9fa Mon Sep 17 00:00:00 2001 From: Nick Sergeant Date: Thu, 31 Jan 2019 11:31:00 -0500 Subject: [PATCH] Disable search until we can get ES going again. --- media/css/style.css | 1 + media/css/style.scss | 1 + settings.py | 18 +++--- snipts/api.py | 16 ++--- snipts/search_indexes.py | 28 ++++----- snipts/views.py | 132 +++++++++++++++++++-------------------- templates/base.html | 20 +++--- templates/homepage.html | 6 +- urls.py | 4 +- 9 files changed, 114 insertions(+), 112 deletions(-) diff --git a/media/css/style.css b/media/css/style.css index 0bc394d..2636702 100644 --- a/media/css/style.css +++ b/media/css/style.css @@ -55,6 +55,7 @@ header.main div.inner div.shadey { background: transparent url("../img/header-inner-bg.png") top left no-repeat; height: 65px; left: -157px; + pointer-events: none; position: absolute; top: 0; width: 432px; diff --git a/media/css/style.scss b/media/css/style.scss index a3f6ad9..a00a58d 100644 --- a/media/css/style.scss +++ b/media/css/style.scss @@ -126,6 +126,7 @@ header.main { background: transparent url('../img/header-inner-bg.png') top left no-repeat; height: 65px; left: -157px; + pointer-events: none; position: absolute; top: 0; width: 432px; diff --git a/settings.py b/settings.py index 843ad6b..9ef4710 100644 --- a/settings.py +++ b/settings.py @@ -18,14 +18,14 @@ CORS_ORIGIN_ALLOW_ALL = True DEBUG = True if "DEBUG" in os.environ else False DEFAULT_FROM_EMAIL = os.environ.get("POSTMARK_EMAIL", "support@siftie.com") EMAIL_BACKEND = "postmark.django_backend.EmailBackend" -HAYSTACK_CONNECTIONS = { - "default": { - "ENGINE": "haystack.backends.whoosh_backend.WhooshEngine", - "PATH": os.environ.get("WHOOSH_PATH", "./.whoosh_index"), - "STORAGE": "file", - } -} -HAYSTACK_SIGNAL_PROCESSOR = "haystack.signals.RealtimeSignalProcessor" +# HAYSTACK_CONNECTIONS = { +# "default": { +# "ENGINE": "haystack.backends.whoosh_backend.WhooshEngine", +# "PATH": os.environ.get("WHOOSH_PATH", "./.whoosh_index"), +# "STORAGE": "file", +# } +# } +# HAYSTACK_SIGNAL_PROCESSOR = "haystack.signals.RealtimeSignalProcessor" INTERNAL_IPS = ("127.0.0.1",) LANGUAGE_CODE = "en-us" LOGIN_REDIRECT_URL = "/login-redirect/" @@ -105,7 +105,7 @@ INSTALLED_APPS = ( "django.contrib.staticfiles", "django_extensions", "gunicorn", - "haystack", + # "haystack", "markdown_deux", "pagination", "postmark", diff --git a/snipts/api.py b/snipts/api.py index d9d3816..c67774a 100644 --- a/snipts/api.py +++ b/snipts/api.py @@ -10,7 +10,7 @@ from django.conf import settings from django.contrib.auth.models import User from django.db import models from django.template.defaultfilters import date, urlize, linebreaksbr -from haystack.query import SearchQuerySet +# from haystack.query import SearchQuerySet from snipts.models import Favorite, Snipt from taggit.models import Tag from taggit.utils import edit_string_for_tags, parse_tags @@ -294,9 +294,9 @@ class PublicSniptResource(ModelResource): tagged_items = tag.taggit_taggeditem_items.all() orm_filters["pk__in"] = [i.object_id for i in tagged_items] - if "q" in filters: - sqs = SearchQuerySet().auto_query(filters["q"]) - orm_filters["pk__in"] = [i.pk for i in sqs] + # if "q" in filters: + # sqs = SearchQuerySet().auto_query(filters["q"]) + # orm_filters["pk__in"] = [i.pk for i in sqs] return orm_filters @@ -520,10 +520,10 @@ class PrivateSniptResource(ModelResource): tagged_items = tag.taggit_taggeditem_items.all() orm_filters["pk__in"] = [i.object_id for i in tagged_items] - if "q" in filters: - user = User.objects.get(username=filters["username"]) - sqs = SearchQuerySet().filter(author=user, content=filters["q"]) - orm_filters["pk__in"] = [i.pk for i in sqs] + # if "q" in filters: + # user = User.objects.get(username=filters["username"]) + # sqs = SearchQuerySet().filter(author=user, content=filters["q"]) + # orm_filters["pk__in"] = [i.pk for i in sqs] return orm_filters diff --git a/snipts/search_indexes.py b/snipts/search_indexes.py index a5a1cf0..0bce97b 100644 --- a/snipts/search_indexes.py +++ b/snipts/search_indexes.py @@ -1,19 +1,19 @@ -import datetime +# import datetime -from haystack import indexes -from snipts.models import Snipt +# from haystack import indexes +# from snipts.models import Snipt -class SniptIndex(indexes.SearchIndex, indexes.Indexable): - text = indexes.CharField(document=True, use_template=True) - author = indexes.CharField(model_attr="user") - pub_date = indexes.DateTimeField(model_attr="created") - public = indexes.BooleanField(model_attr="public") - typ = indexes.CharField(model_attr="lexer") +# class SniptIndex(indexes.SearchIndex, indexes.Indexable): +# text = indexes.CharField(document=True, use_template=True) +# author = indexes.CharField(model_attr="user") +# pub_date = indexes.DateTimeField(model_attr="created") +# public = indexes.BooleanField(model_attr="public") +# typ = indexes.CharField(model_attr="lexer") - def get_model(self): - return Snipt +# def get_model(self): +# return Snipt - def index_queryset(self, **kwargs): - """Used when the entire index for model is updated.""" - return self.get_model().objects.filter(created__lte=datetime.datetime.now()) +# def index_queryset(self, **kwargs): +# """Used when the entire index for model is updated.""" +# return self.get_model().objects.filter(created__lte=datetime.datetime.now()) diff --git a/snipts/views.py b/snipts/views.py index a550cdb..1a5158d 100644 --- a/snipts/views.py +++ b/snipts/views.py @@ -16,8 +16,8 @@ from django.http import ( from django.shortcuts import get_object_or_404, render from django.template import RequestContext from django.views.decorators.cache import never_cache -from haystack.forms import ModelSearchForm -from haystack.query import EmptySearchQuerySet, SearchQuerySet +# from haystack.forms import ModelSearchForm +# from haystack.query import EmptySearchQuerySet, SearchQuerySet from pygments.lexers import get_lexer_by_name from snipts.models import Favorite, Snipt, SniptSecureView from taggit.models import Tag @@ -26,7 +26,7 @@ from teams.models import Team import os -RESULTS_PER_PAGE = getattr(settings, "HAYSTACK_SEARCH_RESULTS_PER_PAGE", 20) +# RESULTS_PER_PAGE = getattr(settings, "HAYSTACK_SEARCH_RESULTS_PER_PAGE", 20) @render_to("snipts/detail.html") @@ -290,86 +290,86 @@ def rss(request, context): return render(request, "rss.xml", context, content_type="application/rss+xml") -@never_cache -def search( - request, - template="search/search.html", - load_all=True, - form_class=ModelSearchForm, - searchqueryset=None, - context_class=RequestContext, - extra_context=None, - results_per_page=None, -): +# @never_cache +# def search( +# request, +# template="search/search.html", +# load_all=True, +# form_class=ModelSearchForm, +# searchqueryset=None, +# context_class=RequestContext, +# extra_context=None, +# results_per_page=None, +# ): - query = "" - results = EmptySearchQuerySet() +# query = "" +# results = EmptySearchQuerySet() - if request.GET.get("q"): +# if request.GET.get("q"): - searchqueryset = ( - SearchQuerySet() - .filter(Q(public=True) | Q(author=request.user)) - .order_by("-pub_date") - ) +# searchqueryset = ( +# SearchQuerySet() +# .filter(Q(public=True) | Q(author=request.user)) +# .order_by("-pub_date") +# ) - if request.user.is_authenticated() and "mine-only" in request.GET: - searchqueryset = ( - SearchQuerySet().filter(author=request.user).order_by("-pub_date") - ) +# if request.user.is_authenticated() and "mine-only" in request.GET: +# searchqueryset = ( +# SearchQuerySet().filter(author=request.user).order_by("-pub_date") +# ) - elif request.user.is_authenticated() and ( - "author" in request.GET and request.GET.get("author") - ): +# elif request.user.is_authenticated() and ( +# "author" in request.GET and request.GET.get("author") +# ): - author = request.GET.get("author") +# author = request.GET.get("author") - if author == request.user.username: - searchqueryset = ( - SearchQuerySet().filter(author=request.user).order_by("-pub_date") - ) +# if author == request.user.username: +# searchqueryset = ( +# SearchQuerySet().filter(author=request.user).order_by("-pub_date") +# ) - else: - team = get_object_or_None(Team, slug=author) +# else: +# team = get_object_or_None(Team, slug=author) - if team and team.user_is_member(request.user): - searchqueryset = ( - SearchQuerySet().filter(author=team).order_by("-pub_date") - ) +# if team and team.user_is_member(request.user): +# searchqueryset = ( +# SearchQuerySet().filter(author=team).order_by("-pub_date") +# ) - form = ModelSearchForm( - request.GET, searchqueryset=searchqueryset, load_all=load_all - ) +# form = ModelSearchForm( +# request.GET, searchqueryset=searchqueryset, load_all=load_all +# ) - if form.is_valid(): - query = form.cleaned_data["q"] - results = form.search() - else: - form = form_class(searchqueryset=searchqueryset, load_all=load_all) +# if form.is_valid(): +# query = form.cleaned_data["q"] +# results = form.search() +# else: +# form = form_class(searchqueryset=searchqueryset, load_all=load_all) - paginator = Paginator(results, results_per_page or RESULTS_PER_PAGE) +# paginator = Paginator(results, results_per_page or RESULTS_PER_PAGE) - try: - page = paginator.page(int(request.GET.get("page", 1))) - except InvalidPage: - raise Http404("No such page of results!") +# try: +# page = paginator.page(int(request.GET.get("page", 1))) +# except InvalidPage: +# raise Http404("No such page of results!") - context = { - "form": form, - "has_snipts": True, - "page": page, - "paginator": paginator, - "query": query, - "suggestion": None, - } +# context = { +# "form": form, +# "has_snipts": True, +# "page": page, +# "paginator": paginator, +# "query": query, +# "suggestion": None, +# } - if results.query.backend.include_spelling: - context["suggestion"] = form.get_suggestion() +# if results.query.backend.include_spelling: +# context["suggestion"] = form.get_suggestion() - if extra_context: - context.update(extra_context) +# if extra_context: +# context.update(extra_context) - return render(request, template, context) +# return render(request, template, context) def redirect_snipt(request, snipt_key, lexer=None): diff --git a/templates/base.html b/templates/base.html index acbb192..1a3bd16 100644 --- a/templates/base.html +++ b/templates/base.html @@ -73,16 +73,16 @@

snipt

-
-
-
- -
-
-
+ + + + + + + + + +