From 50a13c080eebf2c20482f983e044b969167d9748 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Thu, 5 Jul 2012 09:05:07 +0200 Subject: [PATCH] wip: amavis sql schema upgrade * The *local* field from the *users* table was removed because it is commented out by default in README.sql* files * We now use msgrcpt.content instead of msgs.content to reflect per-recipient settings see #287 --- doc/getting_started/plugins.rst | 2 +- modoboa/extensions/amavis/__init__.py | 4 ++-- modoboa/extensions/amavis/migrations/0001_initial.py | 1 - modoboa/extensions/amavis/migrations/0002_create_records.py | 1 - modoboa/extensions/amavis/models.py | 1 - modoboa/extensions/amavis/sql_listing.py | 2 +- 6 files changed, 4 insertions(+), 7 deletions(-) diff --git a/doc/getting_started/plugins.rst b/doc/getting_started/plugins.rst index 96daf57df..9211da55f 100644 --- a/doc/getting_started/plugins.rst +++ b/doc/getting_started/plugins.rst @@ -138,7 +138,7 @@ You are free to change the frequency. .. note:: If you want to let users release their messages alone (not - recommanded), change the value of the ``USER_CAN_RELEASE`` parameter + recommended), change the value of the ``USER_CAN_RELEASE`` parameter into the admin panel. Self-service mode diff --git a/modoboa/extensions/amavis/__init__.py b/modoboa/extensions/amavis/__init__.py index 57c9d78fb..657ee289e 100644 --- a/modoboa/extensions/amavis/__init__.py +++ b/modoboa/extensions/amavis/__init__.py @@ -36,7 +36,7 @@ class Amavis(ModoExtension): except Users.DoesNotExist: p = Policy.objects.create(policy_name=dom.name) Users.objects.create(email="@%s" % dom.name, fullname=dom.name, - local="1", priority=7, policy=p) + priority=7, policy=p) def load(self): parameters.register_admin( @@ -100,7 +100,7 @@ def on_create_domain(user, domain): from models import Users, Policy p = Policy.objects.create(policy_name=domain.name) Users.objects.create(email="@%s" % domain.name, fullname=domain.name, - local="1", priority=7, policy=p) + priority=7, policy=p) @events.observe("DomainModified") def on_domain_modified(domain): diff --git a/modoboa/extensions/amavis/migrations/0001_initial.py b/modoboa/extensions/amavis/migrations/0001_initial.py index 7223f07dd..5fa689c17 100644 --- a/modoboa/extensions/amavis/migrations/0001_initial.py +++ b/modoboa/extensions/amavis/migrations/0001_initial.py @@ -126,7 +126,6 @@ class Migration(SchemaMigration): 'email': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), 'fullname': ('django.db.models.fields.CharField', [], {'max_length': '765', 'blank': 'True'}), 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'local': ('django.db.models.fields.CharField', [], {'max_length': '3', 'blank': 'True'}), 'policy': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['amavis.Policy']"}), 'priority': ('django.db.models.fields.IntegerField', [], {}) }, diff --git a/modoboa/extensions/amavis/migrations/0002_create_records.py b/modoboa/extensions/amavis/migrations/0002_create_records.py index 2443bf330..d8a225405 100644 --- a/modoboa/extensions/amavis/migrations/0002_create_records.py +++ b/modoboa/extensions/amavis/migrations/0002_create_records.py @@ -197,7 +197,6 @@ class Migration(DataMigration): 'email': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), 'fullname': ('django.db.models.fields.CharField', [], {'max_length': '765', 'blank': 'True'}), 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), - 'local': ('django.db.models.fields.CharField', [], {'max_length': '3', 'blank': 'True'}), 'policy': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['amavis.Policy']"}), 'priority': ('django.db.models.fields.IntegerField', [], {}) }, diff --git a/modoboa/extensions/amavis/models.py b/modoboa/extensions/amavis/models.py index 4ba5030ab..fc8a41cb8 100644 --- a/modoboa/extensions/amavis/models.py +++ b/modoboa/extensions/amavis/models.py @@ -169,7 +169,6 @@ class Users(models.Model): policy = models.ForeignKey(Policy) email = models.CharField(unique=True, max_length=255) fullname = models.CharField(max_length=765, blank=True) - local = models.CharField(max_length=3, blank=True) class Meta: db_table = u'users' managed = False diff --git a/modoboa/extensions/amavis/sql_listing.py b/modoboa/extensions/amavis/sql_listing.py index e567dfb7a..c44c181b2 100644 --- a/modoboa/extensions/amavis/sql_listing.py +++ b/modoboa/extensions/amavis/sql_listing.py @@ -70,7 +70,7 @@ class SQLconnector(MBconnector): "subject" : qm.mail.subject, "mailid" : qm.mail_id, "date" : qm.mail.time_num, - "type" : qm.mail.content} + "type" : rcpt.content} if rcpt.rs == '': m["class"] = "unseen" elif rcpt.rs == 'R':