pacnpal/django-anymail
1
0
Fork 0
mirror of https://github.com/pacnpal/django-anymail.git synced 2025-12-21 04:11:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '008b6cf' into test_admin_views

Browse Source 
Conflicts:
	djrill/admin.py
This commit is contained in:
medmunds
2012-12-05 16:01:17 -08:00
parent 1b47ee93e4 008b6cfa36
commit 2c539141f6
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
djrill/admin.py
View File

@@ -4,6 +4,9 @@ from djrill.views import (DjrillIndexView, DjrillSendersListView,
DjrillTagListView, DjrillTagListView,
DjrillUrlListView) DjrillUrlListView)
# Only try to register Djrill admin views if DjrillAdminSite
# or django-adminplus is in use
if hasattr(admin.site,'register_view'):
admin.site.register_view("djrill/senders/", DjrillSendersListView.as_view(), admin.site.register_view("djrill/senders/", DjrillSendersListView.as_view(),
"djrill_senders", "senders") "djrill_senders", "senders")
admin.site.register_view("djrill/status/", DjrillIndexView.as_view(), admin.site.register_view("djrill/status/", DjrillIndexView.as_view(),