Merge branch 'stable' into pfwb

docbow_project/docbow/tables.py

@@ -10,7 +10,7 @@ from . import models
 
 class MailboxTable(tables.Table):
     class Meta:
-        model = models.Mailbox
+        model = models.Document
         attrs = {"class": "paleblue"}
 
 # FIXEM: translation in inline templates are ignored
@@ -33,7 +33,7 @@ class OutboxCsvTable(tables.Table):
 
 
     class Meta:
-        model = models.Mailbox
+        model = models.Document
         fields = ('official_sender',)
         sequence = ('recipients', 'official_sender', 'real_sender', 'filetype', 'filenames', '...')
         attrs = {"class": "paleblue mailbox-table"}
@@ -63,7 +63,7 @@ class OutboxTable(tables.Table):
 
 
     class Meta:
-        model = models.Mailbox
+        model = models.Document
         fields = ('official_sender',)
         sequence = ('recipients', 'official_sender', 'real_sender', 'filetype', 'filenames', '...')
         attrs = {"class": "paleblue mailbox-table refresh", "id": "outbox-table"}
@@ -84,7 +84,7 @@ class InboxCsvTable(tables.Table):
 
 
     class Meta:
-        model = models.Mailbox
+        model = models.Document
         attrs = {"class": "paleblue mailbox-table"}
         empty_text = _('No message')
 
@@ -113,7 +113,7 @@ class InboxTable(tables.Table):
 
 
     class Meta:
-        model = models.Mailbox
+        model = models.Document
         fields = ('seen', 'filetype',)
         attrs = {"class": "paleblue mailbox-table refresh", "id": "outbox-table"}
         empty_text = _('No message')

docbow_project/docbow/views.py

@@ -598,7 +598,7 @@ class ODSMultipleObjectMixin(CSVMultipleObjectMixin):
 class CSVMailboxView(CSVMultipleObjectMixin, ExtraContextMixin,
         MailboxQuerysetMixin, MultipleObjectMixin,
         tables_views.SingleTableMixin, View):
-    model = Mailbox
+    model = Document
 
 
     @property