only import from tenant_schemas if it's present in INSTALLED_APPS (#5064)

This commit is contained in:
Frédéric Péters 2014-06-28 21:12:41 +02:00
parent 8ff21f9516
commit 7ed126c95a
2 changed files with 5 additions and 9 deletions

View File

@ -1,8 +1,9 @@
from django.forms import ModelForm
from django.conf import settings
try:
if 'tenant_schemas' in settings.INSTALLED_APPS:
from tenant_schemas.utils import get_tenant_model
except ImportError:
else:
get_tenant_model = lambda: None
class HoboForm(ModelForm):

View File

@ -7,13 +7,8 @@ from django.views.generic import edit
from django.core.urlresolvers import reverse
from .environment.utils import Zone, get_operational_services
from .forms import HoboForm, HoboUpdateForm
from .forms import HoboForm, HoboUpdateForm, get_tenant_model
try:
from tenant_schemas.utils import get_tenant_model, get_public_schema_name
except ImportError:
get_tenant_model = lambda: None
get_public_schema_name = lambda: ''
class Home(TemplateView):
template_name = 'hobo/home.html'
@ -38,7 +33,7 @@ class ManagerHome(edit.CreateView):
return reverse('manager-home')
def get_context_data(self, **kwargs):
from tenant_schemas.utils import get_tenant_model
from tenant_schemas.utils import get_public_schema_name
context = super(ManagerHome, self).get_context_data(**kwargs)
tenants_list = ()
for obj in get_tenant_model().objects.exclude(schema_name=get_public_schema_name()):