diff --git a/django_mailbox/migrations/0013_auto__add_field_messageattachment_message.py b/django_mailbox/migrations/0013_auto__add_field_messageattachment_message.py new file mode 100644 index 0000000..84796bc --- /dev/null +++ b/django_mailbox/migrations/0013_auto__add_field_messageattachment_message.py @@ -0,0 +1,76 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Removing M2M table for field attachments on 'Message' + db.delete_table('django_mailbox_message_attachments') + + # Adding M2M table for field attachments_old on 'Message' + db.create_table(u'django_mailbox_message_attachments_old', ( + ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), + ('message', models.ForeignKey(orm[u'django_mailbox.message'], null=False)), + ('messageattachment', models.ForeignKey(orm[u'django_mailbox.messageattachment'], null=False)) + )) + db.create_unique(u'django_mailbox_message_attachments_old', ['message_id', 'messageattachment_id']) + + # Adding field 'MessageAttachment.message' + db.add_column(u'django_mailbox_messageattachment', 'message', + self.gf('django.db.models.fields.related.ForeignKey')(blank=True, related_name='attachments', null=True, to=orm['django_mailbox.Message']), + keep_default=False) + + + def backwards(self, orm): + # Adding M2M table for field attachments on 'Message' + db.create_table(u'django_mailbox_message_attachments', ( + ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)), + ('message', models.ForeignKey(orm['django_mailbox.message'], null=False)), + ('messageattachment', models.ForeignKey(orm['django_mailbox.messageattachment'], null=False)) + )) + db.create_unique(u'django_mailbox_message_attachments', ['message_id', 'messageattachment_id']) + + # Removing M2M table for field attachments_old on 'Message' + db.delete_table('django_mailbox_message_attachments_old') + + # Deleting field 'MessageAttachment.message' + db.delete_column(u'django_mailbox_messageattachment', 'message_id') + + + models = { + u'django_mailbox.mailbox': { + 'Meta': {'object_name': 'Mailbox'}, + 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'from_email': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '255', 'null': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'uri': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '255', 'null': 'True', 'blank': 'True'}) + }, + u'django_mailbox.message': { + 'Meta': {'object_name': 'Message'}, + 'attachments_old': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'messages_old'", 'blank': 'True', 'to': u"orm['django_mailbox.MessageAttachment']"}), + 'body': ('django.db.models.fields.TextField', [], {}), + 'from_header': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'in_reply_to': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'replies'", 'null': 'True', 'to': u"orm['django_mailbox.Message']"}), + 'mailbox': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'messages'", 'to': u"orm['django_mailbox.Mailbox']"}), + 'message_id': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'outgoing': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'processed': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'read': ('django.db.models.fields.DateTimeField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}), + 'subject': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'to_header': ('django.db.models.fields.TextField', [], {}) + }, + u'django_mailbox.messageattachment': { + 'Meta': {'object_name': 'MessageAttachment'}, + 'document': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'message': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'attachments'", 'null': 'True', 'to': u"orm['django_mailbox.Message']"}) + } + } + + complete_apps = ['django_mailbox'] \ No newline at end of file diff --git a/django_mailbox/migrations/0014_migrate_message_attachments.py b/django_mailbox/migrations/0014_migrate_message_attachments.py new file mode 100644 index 0000000..7f704f8 --- /dev/null +++ b/django_mailbox/migrations/0014_migrate_message_attachments.py @@ -0,0 +1,55 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + for message in orm['django_mailbox.Message'].objects.all(): + for attachment in message.attachments_old.all(): + attachment.message = message + attachment.save() + + def backwards(self, orm): + for attachment in orm['django_mailbox.MessageAttachment'].objects.all(): + if attachment.message: + attachment.message.attachments_old.add( + attachment + ) + + models = { + u'django_mailbox.mailbox': { + 'Meta': {'object_name': 'Mailbox'}, + 'active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'from_email': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '255', 'null': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'uri': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '255', 'null': 'True', 'blank': 'True'}) + }, + u'django_mailbox.message': { + 'Meta': {'object_name': 'Message'}, + 'attachments_old': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'messages_old'", 'blank': 'True', 'to': u"orm['django_mailbox.MessageAttachment']"}), + 'body': ('django.db.models.fields.TextField', [], {}), + 'from_header': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'in_reply_to': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'replies'", 'null': 'True', 'to': u"orm['django_mailbox.Message']"}), + 'mailbox': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'messages'", 'to': u"orm['django_mailbox.Mailbox']"}), + 'message_id': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'outgoing': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'processed': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'read': ('django.db.models.fields.DateTimeField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}), + 'subject': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'to_header': ('django.db.models.fields.TextField', [], {}) + }, + u'django_mailbox.messageattachment': { + 'Meta': {'object_name': 'MessageAttachment'}, + 'document': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'message': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'attachments'", 'null': 'True', 'to': u"orm['django_mailbox.Message']"}) + } + } + + complete_apps = ['django_mailbox'] diff --git a/django_mailbox/models.py b/django_mailbox/models.py index fa06590..91618fc 100755 --- a/django_mailbox/models.py +++ b/django_mailbox/models.py @@ -195,8 +195,8 @@ class Mailbox(models.Model): temp_file.flush() attachment = MessageAttachment() attachment.document.save(filename, File(temp_file)) + attachment.mesage = msg attachment.save() - msg.attachments.add(attachment) return msg def get_new_mail(self): @@ -233,16 +233,6 @@ class UnreadMessageManager(models.Manager): read=None ) -class MessageAttachment(models.Model): - document = models.FileField(upload_to='mailbox_attachments/%Y/%m/%d/') - - def delete(self, *args, **kwargs): - self.document.delete() - return super(MessageAttachment, self).delete(*args, **kwargs) - - def __unicode__(self): - return self.document.url - class Message(models.Model): mailbox = models.ForeignKey(Mailbox, related_name='messages') subject = models.CharField(max_length=255) @@ -273,11 +263,6 @@ class Message(models.Model): null=True, ) - attachments = models.ManyToManyField( - MessageAttachment, - blank=True, - ) - objects = models.Manager() unread_messages = UnreadMessageManager() incoming_messages = IncomingMessageManager() @@ -357,10 +342,26 @@ class Message(models.Model): def delete(self, *args, **kwargs): for attachment in self.attachments.all(): - if attachment.message_set.count() == 1: - # This attachment is attached only to this message. - attachment.delete() + # This attachment is attached only to this message. + attachment.delete() return super(Message, self).delete(*args, **kwargs) def __unicode__(self): return self.subject + + +class MessageAttachment(models.Model): + message = models.ForeignKey( + Message, + related_name='attachments', + null=True, + blank=True, + ) + document = models.FileField(upload_to='mailbox_attachments/%Y/%m/%d/') + + def delete(self, *args, **kwargs): + self.document.delete() + return super(MessageAttachment, self).delete(*args, **kwargs) + + def __unicode__(self): + return self.document.url