From 2ee59df866dd5c00e256348e87a8d64fa2aec71f Mon Sep 17 00:00:00 2001
From: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
Date: Thu, 12 Apr 2012 12:25:59 -0400
Subject: [PATCH] Removal of the SEARCH_SHOW_OBJECT_TYPE and SEARCH_LIMIT
 configuration options

---
 apps/dynamic_search/conf/settings.py | 16 ----------------
 apps/dynamic_search/views.py         |  8 +-------
 docs/releases/0.13.rst               |  3 ++-
 3 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/apps/dynamic_search/conf/settings.py b/apps/dynamic_search/conf/settings.py
index 78ff433087..ac9c80a476 100644
--- a/apps/dynamic_search/conf/settings.py
+++ b/apps/dynamic_search/conf/settings.py
@@ -6,22 +6,6 @@ from smart_settings.api import Setting, SettingNamespace
 
 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(
     namespace=namespace,
     name='RECENT_COUNT',
diff --git a/apps/dynamic_search/views.py b/apps/dynamic_search/views.py
index a5c08a6080..65e2c4c83e 100644
--- a/apps/dynamic_search/views.py
+++ b/apps/dynamic_search/views.py
@@ -4,11 +4,11 @@ import urlparse
 from django.shortcuts import render_to_response
 from django.template import RequestContext
 from django.utils.translation import ugettext_lazy as _
+from django.utils.http import urlencode
 from django.contrib import messages
 from django.conf import settings
 from django.http import HttpResponseRedirect
 from django.core.urlresolvers import reverse
-from django.utils.http import urlencode
 
 from haystack.views import SearchView
 
@@ -17,12 +17,6 @@ from common.utils import encapsulate
 from dynamic_search.models import RecentSearch
 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):
     def __call__(self, *args, **kwargs):
diff --git a/docs/releases/0.13.rst b/docs/releases/0.13.rst
index 20bb0e0591..bcea977354 100644
--- a/docs/releases/0.13.rst
+++ b/docs/releases/0.13.rst
@@ -60,4 +60,5 @@ Bugs fixed
 
 Stuff removed
 =============
-None so far
+Removal of the internal SEARCH_SHOW_OBJECT_TYPE option
+Removal of the SEARCH_LIMIT configuration option