From 1bb37b11750763d8e5bfef617be0916d8fb6ba6e Mon Sep 17 00:00:00 2001 From: Marc Aymerich Date: Fri, 1 May 2015 18:18:13 +0000 Subject: [PATCH] Commented django_mailer app --- orchestra/conf/base_settings.py | 2 +- orchestra/contrib/resources/admin.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/orchestra/conf/base_settings.py b/orchestra/conf/base_settings.py index 751a1042..766fd22f 100644 --- a/orchestra/conf/base_settings.py +++ b/orchestra/conf/base_settings.py @@ -104,7 +104,7 @@ INSTALLED_APPS = ( 'rest_framework.authtoken', 'passlib.ext.django', 'django_countries', - 'django_mailer', +# 'django_mailer', # Django.contrib 'django.contrib.auth', diff --git a/orchestra/contrib/resources/admin.py b/orchestra/contrib/resources/admin.py index e3a090de..13e02f99 100644 --- a/orchestra/contrib/resources/admin.py +++ b/orchestra/contrib/resources/admin.py @@ -180,7 +180,7 @@ admin.site.register(MonitorData, MonitorDataAdmin) # Mokey-patching def resource_inline_factory(resources): - class ResourceInlineFormSet(contenttype.forms.BaseGenericInlineFormSet): + class ResourceInlineFormSet(contenttypes.forms.BaseGenericInlineFormSet): def total_form_count(self, resources=resources): return len(resources) @@ -220,7 +220,7 @@ def resource_inline_factory(resources): forms.append(self._construct_form(i, resource=resource)) return forms - class ResourceInline(contenttype.admin.GenericTabularInline): + class ResourceInline(contenttypes.admin.GenericTabularInline): model = ResourceData verbose_name_plural = _("resources") form = ResourceForm