entrouvert
/
python-entrouvert
Archived
17
0
Fork 0
Code Issues Pull Requests Releases Activity

In FileSystemLoader rename settings from MULTITENANT_TEMPLATE_DIRS to TENANT_TEMPLATE_DIRS to unformize with other settings 

refs #5106
This commit is contained in:
Benjamin Dauvergne 2014-08-19 11:05:48 +02:00
parent e4332b4337
commit 73b85f5d53
2 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
entrouvert/djommon/multitenant/app_settings.py
View File

@ -1,19 +0,0 @@
import sys
class AppSettings:
@property
def settings(self):
if not hasattr(self, '_settings'):
from django.conf import settings
self._settings = settings
return self._settings
@property
def MULTITENANT_TEMPLATE_DIRS(self):
return self.settings.MULTITENANT_TEMPLATE_DIRS
app_settings = AppSettings()
app_settings.__name__ = __name__
sys.modules[__name__] = app_settings

8
entrouvert/djommon/multitenant/template_loader.py
View File

@ -12,8 +12,6 @@ from django.utils.encoding import force_bytes
from django.utils._os import safe_join
from django.db import connection
from . import app_settings
class CachedLoader(BaseLoader):
is_usable = True
@ -86,9 +84,9 @@ class FilesystemLoader(BaseLoader):
return
if not template_dirs:
try:
template_dirs = app_settings.MULTITENANT_TEMPLATE_DIRS
template_dirs = settings.TENANT_TEMPLATE_DIRS
except AttributeError:
raise ImproperlyConfigured('To use %s.%s you must define the MULTITENANT_TEMPLATE_DIRS' % (__name__, FilesystemLoader.__name__))
raise ImproperlyConfigured('To use %s.%s you must define the TENANT_TEMPLATE_DIRS' % (__name__, FilesystemLoader.__name__))
for template_dir in template_dirs:
try:
yield safe_join(template_dir, connection.tenant.domain_url, template_name)
@ -112,6 +110,6 @@ class FilesystemLoader(BaseLoader):
if tried:
error_msg = "Tried %s" % tried
else:
error_msg = "Your TEMPLATE_DIRS setting is empty. Change it to point to at least one template directory."
error_msg = "Your TENANT_TEMPLATE_DIRS setting is empty. Change it to point to at least one template directory."
raise TemplateDoesNotExist(error_msg)
load_template_source.is_usable = True