1
0
Fork 0

Merging in upstream changes from github.

This commit is contained in:
Adam Coddington 2013-01-14 03:28:59 -08:00
commit 4546741c20
4 changed files with 106 additions and 3 deletions

View file

@ -1,7 +1,7 @@
from django.conf import settings
from django.contrib import admin
from django_mailbox.models import Message, Mailbox
from django_mailbox.models import MessageAttachment, Message, Mailbox
def get_new_mail(mailbox_admin, request, queryset):
for mailbox in queryset.all():
@ -17,6 +17,9 @@ class MailboxAdmin(admin.ModelAdmin):
)
actions = [get_new_mail]
class MessageAttachmentAdmin(admin.ModelAdmin):
list_display = ('document',)
class MessageAdmin(admin.ModelAdmin):
list_display = (
'subject',
@ -38,4 +41,5 @@ class MessageAdmin(admin.ModelAdmin):
if getattr(settings, 'DJANGO_MAILBOX_ADMIN_ENABLED', True):
admin.site.register(Message, MessageAdmin)
admin.site.register(MessageAttachment, MessageAttachmentAdmin)
admin.site.register(Mailbox, MailboxAdmin)