Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Settings ready for debugging; removed select_related

Browse Source 
svn: r13651
This commit is contained in:
Doug Blank 2009-11-22 13:43:40 +00:00
parent a477d5bc7d
commit bfdb19d182
2 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/web/grampsdb/views.py
View File

@ -154,7 +154,6 @@ def view(request, view):
object_list = Name.objects \ object_list = Name.objects \
.filter(surname__istartswith=surname, .filter(surname__istartswith=surname,
first_name__istartswith=first_name) \ first_name__istartswith=first_name) \
.select_related() \
.order_by("surname", "first_name") .order_by("surname", "first_name")
else: else:
object_list = Name.objects \ object_list = Name.objects \
@ -166,16 +165,16 @@ def view(request, view):
Q(title__icontains=search) | Q(title__icontains=search) |
Q(person__gramps_id__icontains=search) Q(person__gramps_id__icontains=search)
) \ ) \
.select_related() \
.order_by("surname", "first_name") .order_by("surname", "first_name")
else: else:
# FIXME: non-authenticated users don't get to search first_names # FIXME: non-authenticated users don't get to search first_names
if "," in search: if "," in search:
search, first_name = [term.strip() for term in search.split(",", 1)] search, first_name = [term.strip() for term in search.split(",", 1)]
object_list = Name.objects. \ object_list = Name.objects \
select_related().filter(surname__istartswith=search).order_by("surname", "first_name") .filter(surname__istartswith=search) \
.order_by("surname", "first_name")
else: 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' view_template = 'view_people.html'
elif view == "place": elif view == "place":
object_list = Place.objects.all().order_by("gramps_id") object_list = Place.objects.all().order_by("gramps_id")

40
src/web/settings.py
View File

@ -49,7 +49,7 @@ TEMPLATE_DIRS = (
TEMPLATE_CONTEXT_PROCESSORS = ( TEMPLATE_CONTEXT_PROCESSORS = (
"django.core.context_processors.auth", "django.core.context_processors.auth",
# "django.core.context_processors.debug", "django.core.context_processors.debug",
"django.core.context_processors.i18n", "django.core.context_processors.i18n",
"django.core.context_processors.media", "django.core.context_processors.media",
"web.grampsdb.views.context_processor", "web.grampsdb.views.context_processor",
@ -66,27 +66,27 @@ INSTALLED_APPS = (
# 'debug_toolbar', # 'debug_toolbar',
) )
#DEBUG_TOOLBAR_PANELS = ( DEBUG_TOOLBAR_PANELS = (
# 'debug_toolbar.panels.version.VersionDebugPanel', 'debug_toolbar.panels.version.VersionDebugPanel',
# 'debug_toolbar.panels.timer.TimerDebugPanel', 'debug_toolbar.panels.timer.TimerDebugPanel',
# 'debug_toolbar.panels.settings_vars.SettingsVarsDebugPanel', 'debug_toolbar.panels.settings_vars.SettingsVarsDebugPanel',
# 'debug_toolbar.panels.headers.HeaderDebugPanel', 'debug_toolbar.panels.headers.HeaderDebugPanel',
# 'debug_toolbar.panels.request_vars.RequestVarsDebugPanel', 'debug_toolbar.panels.request_vars.RequestVarsDebugPanel',
# 'debug_toolbar.panels.template.TemplateDebugPanel', 'debug_toolbar.panels.template.TemplateDebugPanel',
# 'debug_toolbar.panels.sql.SQLDebugPanel', 'debug_toolbar.panels.sql.SQLDebugPanel',
# 'debug_toolbar.panels.signals.SignalDebugPanel', 'debug_toolbar.panels.signals.SignalDebugPanel',
# 'debug_toolbar.panels.logger.LoggingPanel', 'debug_toolbar.panels.logger.LoggingPanel',
# ) )
#def custom_show_toolbar(request): def custom_show_toolbar(request):
# return True # Always show toolbar, for example purposes only. return True # Always show toolbar, for example purposes only.
#DEBUG_TOOLBAR_CONFIG = { DEBUG_TOOLBAR_CONFIG = {
# 'INTERCEPT_REDIRECTS': True, 'INTERCEPT_REDIRECTS': False,
## 'SHOW_TOOLBAR_CALLBACK': custom_show_toolbar, # 'SHOW_TOOLBAR_CALLBACK': custom_show_toolbar,
## 'EXTRA_SIGNALS': ['myproject.signals.MySignal'], # 'EXTRA_SIGNALS': ['myproject.signals.MySignal'],
# 'HIDE_DJANGO_SQL': False, 'HIDE_DJANGO_SQL': False,
# } }
# Had to add these to use settings.configure(): # Had to add these to use settings.configure():
DATABASE_OPTIONS = '' DATABASE_OPTIONS = ''