github-jwinterm/modoboa
1
0
Fork 0
mirror of https://github.com/jwinterm/modoboa.git synced 2026-10-18 05:51:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Unique constraint must be set on both armessage AND sender.

Browse Source 
fixes #467
This commit is contained in:
Antoine Nguyen
2013-09-01 16:16:33 +02:00
parent b2f5c026e6
commit d1616f5307
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modoboa/extensions/postfix_autoreply/migrations/0003_auto__add_unique_arhistoric_armessage.py → modoboa/extensions/postfix_autoreply/migrations/0003_auto__add_unique_arhistoric_sender_armessage.py
+6 -6
View File
@@ -8,13 +8,13 @@ from django.db import models
class Migration(SchemaMigration):
def forwards(self, orm):
# Adding unique constraint on 'ARhistoric', fields ['armessage']
db.create_unique(u'postfix_autoreply_arhistoric', ['armessage_id'])
# Adding unique constraint on 'ARhistoric', fields ['sender', 'armessage']
db.create_unique(u'postfix_autoreply_arhistoric', ['sender', 'armessage_id'])
def backwards(self, orm):
# Removing unique constraint on 'ARhistoric', fields ['armessage']
db.delete_unique(u'postfix_autoreply_arhistoric', ['armessage_id'])
# Removing unique constraint on 'ARhistoric', fields ['sender', 'armessage']
db.delete_unique(u'postfix_autoreply_arhistoric', ['sender', 'armessage_id'])
models = {
@@ -94,8 +94,8 @@ class Migration(SchemaMigration):
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
},
u'postfix_autoreply.arhistoric': {
'Meta': {'object_name': 'ARhistoric'},
'armessage': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['postfix_autoreply.ARmessage']", 'unique': 'True'}),
'Meta': {'unique_together': "(('armessage', 'sender'),)", 'object_name': 'ARhistoric'},
'armessage': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['postfix_autoreply.ARmessage']"}),
u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
'last_sent': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
'sender': ('django.db.models.fields.TextField', [], {})
modoboa/extensions/postfix_autoreply/models.py
+8 -1
View File
@@ -2,14 +2,17 @@ from django.db import models
from django.utils.translation import ugettext_lazy as _
from modoboa.admin.models import Domain, Mailbox
class Transport(models.Model):
domain = models.CharField(max_length=300)
method = models.CharField(max_length=255)
class Alias(models.Model):
full_address = models.CharField(max_length=255)
autoreply_address = models.CharField(max_length=255)
class ARmessage(models.Model):
mbox = models.ForeignKey(Mailbox)
subject = models.CharField(_('subject'), max_length=255,
@@ -20,7 +23,11 @@ class ARmessage(models.Model):
help_text=_("Activate/Deactivate your auto reply"))
untildate = models.DateTimeField()
class ARhistoric(models.Model):
armessage = models.ForeignKey(ARmessage, unique=True)
armessage = models.ForeignKey(ARmessage)
last_sent = models.DateTimeField(auto_now=True)
sender = models.TextField()
class Meta:
unique_together = ("armessage", "sender")