From bfdb19d182fdacab41d73f5054d6beaaca3673bc Mon Sep 17 00:00:00 2001
From: Doug Blank <doug.blank@gmail.com>
Date: Sun, 22 Nov 2009 13:43:40 +0000
Subject: [PATCH] Settings ready for debugging; removed select_related

svn: r13651
---
 src/web/grampsdb/views.py |  9 ++++-----
 src/web/settings.py       | 40 +++++++++++++++++++--------------------
 2 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/src/web/grampsdb/views.py b/src/web/grampsdb/views.py
index 8146e639e..c5cd5e47c 100644
--- a/src/web/grampsdb/views.py
+++ b/src/web/grampsdb/views.py
@@ -154,7 +154,6 @@ def view(request, view):
                     object_list = Name.objects \
                         .filter(surname__istartswith=surname, 
                                 first_name__istartswith=first_name) \
-                                .select_related() \
                                 .order_by("surname", "first_name")
                 else:
                     object_list = Name.objects \
@@ -166,16 +165,16 @@ def view(request, view):
                                 Q(title__icontains=search) |
                                 Q(person__gramps_id__icontains=search)
                                 ) \
-                        .select_related() \
                         .order_by("surname", "first_name")
             else:
                 # FIXME: non-authenticated users don't get to search first_names
                 if "," in search:
                     search, first_name = [term.strip() for term in search.split(",", 1)]
-                object_list = Name.objects. \
-                    select_related().filter(surname__istartswith=search).order_by("surname", "first_name")
+                object_list = Name.objects \
+                    .filter(surname__istartswith=search) \
+                    .order_by("surname", "first_name")
         else:
-            object_list = Name.objects.select_related().order_by("surname", "first_name")
+            object_list = Name.objects.order_by("surname", "first_name")
         view_template = 'view_people.html'
     elif view == "place":
         object_list = Place.objects.all().order_by("gramps_id")
diff --git a/src/web/settings.py b/src/web/settings.py
index 26289b1c2..248a8c914 100644
--- a/src/web/settings.py
+++ b/src/web/settings.py
@@ -49,7 +49,7 @@ TEMPLATE_DIRS = (
 
 TEMPLATE_CONTEXT_PROCESSORS = (
     "django.core.context_processors.auth",
-#    "django.core.context_processors.debug",
+    "django.core.context_processors.debug",
     "django.core.context_processors.i18n",
     "django.core.context_processors.media",
     "web.grampsdb.views.context_processor",
@@ -66,27 +66,27 @@ INSTALLED_APPS = (
 #    'debug_toolbar',
 )
 
-#DEBUG_TOOLBAR_PANELS = (
-#    'debug_toolbar.panels.version.VersionDebugPanel',
-#    'debug_toolbar.panels.timer.TimerDebugPanel',
-#    'debug_toolbar.panels.settings_vars.SettingsVarsDebugPanel',
-#    'debug_toolbar.panels.headers.HeaderDebugPanel',
-#    'debug_toolbar.panels.request_vars.RequestVarsDebugPanel',
-#    'debug_toolbar.panels.template.TemplateDebugPanel',
-#    'debug_toolbar.panels.sql.SQLDebugPanel',
-#    'debug_toolbar.panels.signals.SignalDebugPanel',
-#    'debug_toolbar.panels.logger.LoggingPanel',
-#    )
+DEBUG_TOOLBAR_PANELS = (
+    'debug_toolbar.panels.version.VersionDebugPanel',
+    'debug_toolbar.panels.timer.TimerDebugPanel',
+    'debug_toolbar.panels.settings_vars.SettingsVarsDebugPanel',
+    'debug_toolbar.panels.headers.HeaderDebugPanel',
+    'debug_toolbar.panels.request_vars.RequestVarsDebugPanel',
+    'debug_toolbar.panels.template.TemplateDebugPanel',
+    'debug_toolbar.panels.sql.SQLDebugPanel',
+    'debug_toolbar.panels.signals.SignalDebugPanel',
+    'debug_toolbar.panels.logger.LoggingPanel',
+    )
 
-#def custom_show_toolbar(request):
-#    return True # Always show toolbar, for example purposes only.
+def custom_show_toolbar(request):
+    return True # Always show toolbar, for example purposes only.
 
-#DEBUG_TOOLBAR_CONFIG = {
-#    'INTERCEPT_REDIRECTS': True,
-##    'SHOW_TOOLBAR_CALLBACK': custom_show_toolbar,
-##    'EXTRA_SIGNALS': ['myproject.signals.MySignal'],
-#    'HIDE_DJANGO_SQL': False,
-#    }
+DEBUG_TOOLBAR_CONFIG = {
+    'INTERCEPT_REDIRECTS': False,
+#    'SHOW_TOOLBAR_CALLBACK': custom_show_toolbar,
+#    'EXTRA_SIGNALS': ['myproject.signals.MySignal'],
+    'HIDE_DJANGO_SQL': False,
+    }
 
 # Had to add these to use settings.configure():
 DATABASE_OPTIONS = ''