Merge branch 'master' of github.com:tonioo/modoboa

modoboa/core/migrations/0004_auto_20150728_1228.py

@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0003_user_master_user'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='user',
+            name='email',
+            field=models.EmailField(db_index=True, max_length=254, blank=True),
+            preserve_default=True,
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='is_active',
+            field=models.BooleanField(default=True, db_index=True),
+            preserve_default=True,
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='is_local',
+            field=models.BooleanField(default=True, db_index=True),
+            preserve_default=True,
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='is_staff',
+            field=models.BooleanField(default=False, db_index=True),
+            preserve_default=True,
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='master_user',
+            field=models.BooleanField(default=False, help_text='Allow this administrator to access user mailboxes', verbose_name='Allow mailboxes access'),
+            preserve_default=True,
+        ),
+        migrations.AlterIndexTogether(
+            name='user',
+            index_together=set([('email', 'is_active')]),
+        ),
+    ]

modoboa/core/models.py

@@ -44,11 +44,11 @@ class User(PermissionsMixin):
     username = models.CharField(max_length=254, unique=True)
     first_name = models.CharField(max_length=30, blank=True)
     last_name = models.CharField(max_length=30, blank=True)
-    email = models.EmailField(max_length=254, blank=True)
-    is_staff = models.BooleanField(default=False)
-    is_active = models.BooleanField(default=True)
+    email = models.EmailField(max_length=254, blank=True, db_index=True)
+    is_staff = models.BooleanField(default=False, db_index=True)
+    is_active = models.BooleanField(default=True, db_index=True)
     date_joined = models.DateTimeField(default=timezone.now)
-    is_local = models.BooleanField(default=True)
+    is_local = models.BooleanField(default=True, db_index=True)
     master_user = models.BooleanField(
         ugettext_lazy("Allow mailboxes access"), default=False,
         help_text=ugettext_lazy(
@@ -67,6 +67,9 @@ class User(PermissionsMixin):
 
     class Meta:
         ordering = ["username"]
+        index_together = [
+            ['email', 'is_active']
+        ]
 
     password_expr = re.compile(r'\{([\w\-]+)\}(.+)')