pacnpal/django-anymail
1
0
Fork 0
mirror of https://github.com/pacnpal/django-anymail.git synced 2025-12-20 20:01:05 -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

19
djrill/admin.py
View File

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