pedro
/
django-orchestra-test
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commented django_mailer app

This commit is contained in:
Marc Aymerich 2015-05-01 18:18:13 +00:00
parent 1367d9d545
commit 1bb37b1175
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
orchestra/conf/base_settings.py
View File

@ -104,7 +104,7 @@ INSTALLED_APPS = (
'rest_framework.authtoken', 'rest_framework.authtoken',
'passlib.ext.django', 'passlib.ext.django',
'django_countries', 'django_countries',
'django_mailer', # 'django_mailer',
# Django.contrib # Django.contrib
'django.contrib.auth', 'django.contrib.auth',

4
orchestra/contrib/resources/admin.py
View File

@ -180,7 +180,7 @@ admin.site.register(MonitorData, MonitorDataAdmin)
# Mokey-patching # Mokey-patching
def resource_inline_factory(resources): def resource_inline_factory(resources):
class ResourceInlineFormSet(contenttype.forms.BaseGenericInlineFormSet): class ResourceInlineFormSet(contenttypes.forms.BaseGenericInlineFormSet):
def total_form_count(self, resources=resources): def total_form_count(self, resources=resources):
return len(resources) return len(resources)
@ -220,7 +220,7 @@ def resource_inline_factory(resources):
forms.append(self._construct_form(i, resource=resource)) forms.append(self._construct_form(i, resource=resource))
return forms return forms
class ResourceInline(contenttype.admin.GenericTabularInline): class ResourceInline(contenttypes.admin.GenericTabularInline):
model = ResourceData model = ResourceData
verbose_name_plural = _("resources") verbose_name_plural = _("resources")
form = ResourceForm form = ResourceForm