Hopiu/django-dbtemplates
1
0
Fork 0
mirror of https://github.com/jazzband/django-dbtemplates.git synced 2026-05-22 14:21:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Slight corrections to loader.

Browse source
This commit is contained in:
Jannis Leidel 2011-08-15 13:08:38 +02:00
parent 52528648ba
commit e55e52156f
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
dbtemplates/loader.py
View file

@ -3,8 +3,8 @@ from django.template import TemplateDoesNotExist
from dbtemplates.conf import settings
from dbtemplates.models import Template
from dbtemplates.utils.cache import cache, get_cache_key, set_and_return
from dbtemplates.utils.cache import get_cache_notfound_key
from dbtemplates.utils.cache import (cache, get_cache_key,
set_and_return, get_cache_notfound_key)
from django.template.loader import BaseLoader
@ -60,12 +60,10 @@ class Loader(BaseLoader):
template = Template.objects.get(name__exact=template_name,
sites__in=[site.id])
return set_and_return(cache_key, template.content, display_name)
except Template.DoesNotExist:
except (Template.MultipleObjectsReturned, Template.DoesNotExist):
try:
template = Template.objects.get(
name__exact=template_name)
return set_and_return(
cache_key, template.content, display_name)
template = Template.objects.get(name__exact=template_name)
return set_and_return(cache_key, template.content, display_name)
except Template.DoesNotExist:
pass