From fd0781eb314835ac6857ebf4f7a8ef6232c9f267 Mon Sep 17 00:00:00 2001
From: Roberto Rosario <Roberto.Rosario.Gonzalez@gmail.com>
Date: Thu, 14 Apr 2011 15:35:15 -0400
Subject: [PATCH] Added the SIDE_BAR_SEARCH setting option to the settings view

---
 apps/main/conf/settings.py | 9 +++++++++
 apps/main/views.py         | 5 +++++
 2 files changed, 14 insertions(+)

diff --git a/apps/main/conf/settings.py b/apps/main/conf/settings.py
index 35bbac8a27..8a7cf11bfd 100644
--- a/apps/main/conf/settings.py
+++ b/apps/main/conf/settings.py
@@ -1,3 +1,12 @@
+'''Configuration options for the main app
+'''
+
 from django.conf import settings
+from django.utils.translation import ugettext_lazy as _
 
 SIDE_BAR_SEARCH = getattr(settings, 'MAIN_SIDE_BAR_SEARCH', False)
+
+setting_description = {
+    'MAIN_SIDE_BAR_SEARCH': _(u'Controls whether the search\
+     functionality is provided by a sidebar widget or by a menu entry.')
+}
diff --git a/apps/main/views.py b/apps/main/views.py
index 52957f22a2..d073be4040 100644
--- a/apps/main/views.py
+++ b/apps/main/views.py
@@ -14,6 +14,7 @@ from ocr.conf import settings as ocr_settings
 from ocr.statistics import get_statistics as ocr_statistics
 from filesystem_serving.conf import settings as filesystem_serving_settings
 from dynamic_search.conf import settings as search_settings
+from main.conf import settings as main_settings
 
 from main.api import diagnostics
 
@@ -25,6 +26,10 @@ def home(request):
 
 def check_settings(request):
     settings = [
+        {'name': 'MAIN_SIDE_BAR_SEARCH',
+            'value': main_settings.SIDE_BAR_SEARCH,
+            'description': main_settings.setting_description},
+        
         {'name': 'DOCUMENTS_METADATA_AVAILABLE_FUNCTIONS', 'value': documents_settings.AVAILABLE_FUNCTIONS},
         {'name': 'DOCUMENTS_METADATA_AVAILABLE_MODELS', 'value': documents_settings.AVAILABLE_MODELS},
         {'name': 'DOCUMENTS_INDEXING_AVAILABLE_INDEXING_FUNCTIONS', 'value': documents_settings.AVAILABLE_INDEXING_FUNCTIONS},