Merge 45488cb725 into 08512ac316

django_mailbox/admin.py

@@ -43,6 +43,7 @@ resend_message_received_signal.short_description = (
 class MailboxAdmin(admin.ModelAdmin):
     list_display = (
         'name',
+        'user',
         'uri',
         'from_email',
         'active',

django_mailbox/migrations/0007_auto_20171105_1015.py

@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.3 on 2017-11-05 09:15
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('django_mailbox', '0006_mailbox_last_polling'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='mailbox',
+            name='user',
+            field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL),
+        ),
+    ]

django_mailbox/models.py

@@ -48,6 +48,13 @@ class ActiveMailboxManager(models.Manager):
 
 @python_2_unicode_compatible
 class Mailbox(models.Model):
+    user = models.ForeignKey(
+        django_settings.AUTH_USER_MODEL,
+        blank=True,
+        null=True,
+        default=None
+    )
+
     name = models.CharField(
         _(u'Name'),
         max_length=255,