Removal of the SEARCH_SHOW_OBJECT_TYPE and SEARCH_LIMIT configuration options
This commit is contained in:
@@ -6,22 +6,6 @@ from smart_settings.api import Setting, SettingNamespace
|
|||||||
|
|
||||||
namespace = SettingNamespace('dynamic_search', _(u'Searching'), module='dynamic_search.conf.settings')
|
namespace = SettingNamespace('dynamic_search', _(u'Searching'), module='dynamic_search.conf.settings')
|
||||||
|
|
||||||
Setting(
|
|
||||||
namespace=namespace,
|
|
||||||
name='SHOW_OBJECT_TYPE',
|
|
||||||
global_name='SEARCH_SHOW_OBJECT_TYPE',
|
|
||||||
default=True,
|
|
||||||
hidden=True
|
|
||||||
)
|
|
||||||
|
|
||||||
Setting(
|
|
||||||
namespace=namespace,
|
|
||||||
name='LIMIT',
|
|
||||||
global_name='SEARCH_LIMIT',
|
|
||||||
default=100,
|
|
||||||
description=_(u'Maximum amount search hits to fetch and display.')
|
|
||||||
)
|
|
||||||
|
|
||||||
Setting(
|
Setting(
|
||||||
namespace=namespace,
|
namespace=namespace,
|
||||||
name='RECENT_COUNT',
|
name='RECENT_COUNT',
|
||||||
|
|||||||
@@ -4,11 +4,11 @@ import urlparse
|
|||||||
from django.shortcuts import render_to_response
|
from django.shortcuts import render_to_response
|
||||||
from django.template import RequestContext
|
from django.template import RequestContext
|
||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
|
from django.utils.http import urlencode
|
||||||
from django.contrib import messages
|
from django.contrib import messages
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
from django.http import HttpResponseRedirect
|
from django.http import HttpResponseRedirect
|
||||||
from django.core.urlresolvers import reverse
|
from django.core.urlresolvers import reverse
|
||||||
from django.utils.http import urlencode
|
|
||||||
|
|
||||||
from haystack.views import SearchView
|
from haystack.views import SearchView
|
||||||
|
|
||||||
@@ -17,12 +17,6 @@ from common.utils import encapsulate
|
|||||||
from dynamic_search.models import RecentSearch
|
from dynamic_search.models import RecentSearch
|
||||||
from dynamic_search.api import perform_search
|
from dynamic_search.api import perform_search
|
||||||
|
|
||||||
#TODO: DEPRECATED
|
|
||||||
from dynamic_search.conf.settings import SHOW_OBJECT_TYPE
|
|
||||||
|
|
||||||
#TODO: DEPRECATED?
|
|
||||||
from dynamic_search.conf.settings import LIMIT
|
|
||||||
|
|
||||||
|
|
||||||
class CustomSearchView(SearchView):
|
class CustomSearchView(SearchView):
|
||||||
def __call__(self, *args, **kwargs):
|
def __call__(self, *args, **kwargs):
|
||||||
|
|||||||
@@ -60,4 +60,5 @@ Bugs fixed
|
|||||||
|
|
||||||
Stuff removed
|
Stuff removed
|
||||||
=============
|
=============
|
||||||
None so far
|
Removal of the internal SEARCH_SHOW_OBJECT_TYPE option
|
||||||
|
Removal of the SEARCH_LIMIT configuration option
|
||||||
|
|||||||
Reference in New Issue
Block a user