diff --git a/modoboa/admin/apps.py b/modoboa/admin/apps.py index 31e7e2808..a5c67bc44 100644 --- a/modoboa/admin/apps.py +++ b/modoboa/admin/apps.py @@ -8,7 +8,6 @@ from .app_settings import load_admin_settings class AdminConfig(AppConfig): """App configuration.""" - default_auto_field = "django.db.models.BigAutoField" name = "modoboa.admin" verbose_name = "Modoboa admin console" diff --git a/modoboa/admin/migrations/0021_auto_20220926_0913.py b/modoboa/admin/migrations/0021_auto_20220926_0913.py deleted file mode 100644 index 2f05f7e61..000000000 --- a/modoboa/admin/migrations/0021_auto_20220926_0913.py +++ /dev/null @@ -1,63 +0,0 @@ -# Generated by Django 3.2.12 on 2022-09-26 07:13 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('admin', '0020_auto_20210130_2226'), - ] - - operations = [ - migrations.AlterField( - model_name='alarm', - name='id', - field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), - ), - migrations.AlterField( - model_name='alias', - name='id', - field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), - ), - migrations.AlterField( - model_name='aliasrecipient', - name='id', - field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), - ), - migrations.AlterField( - model_name='dnsblresult', - name='id', - field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), - ), - migrations.AlterField( - model_name='domain', - name='id', - field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), - ), - migrations.AlterField( - model_name='domainalias', - name='id', - field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), - ), - migrations.AlterField( - model_name='mailbox', - name='id', - field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), - ), - migrations.AlterField( - model_name='mailboxoperation', - name='id', - field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), - ), - migrations.AlterField( - model_name='mxrecord', - name='id', - field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), - ), - migrations.AlterField( - model_name='senderaddress', - name='id', - field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), - ), - ] diff --git a/modoboa/core/apps.py b/modoboa/core/apps.py index 4ab3218bd..515174dce 100644 --- a/modoboa/core/apps.py +++ b/modoboa/core/apps.py @@ -26,7 +26,6 @@ def load_core_settings(): class CoreConfig(AppConfig): """App configuration.""" - default_auto_field = "django.db.models.BigAutoField" name = "modoboa.core" verbose_name = "Modoboa core" diff --git a/modoboa/core/commands/templates/settings.py.tpl b/modoboa/core/commands/templates/settings.py.tpl index bdb79434c..bdbde5683 100644 --- a/modoboa/core/commands/templates/settings.py.tpl +++ b/modoboa/core/commands/templates/settings.py.tpl @@ -175,7 +175,7 @@ USE_TZ = True # Default primary key field type # https://docs.djangoproject.com/en/3.2/ref/settings/#default-auto-field -DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' +DEFAULT_AUTO_FIELD = 'django.db.models.AutoField' # Static files (CSS, JavaScript, Images) # https://docs.djangoproject.com/en/2.2/howto/static-files/ diff --git a/modoboa/core/migrations/0023_auto_20220926_0913.py b/modoboa/core/migrations/0023_auto_20220926_0913.py deleted file mode 100644 index 2f8fc2aed..000000000 --- a/modoboa/core/migrations/0023_auto_20220926_0913.py +++ /dev/null @@ -1,48 +0,0 @@ -# Generated by Django 3.2.12 on 2022-09-26 07:13 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('core', '0022_user_tfa_enabled'), - ] - - operations = [ - migrations.AlterField( - model_name='extensionupdatehistory', - name='id', - field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), - ), - migrations.AlterField( - model_name='localconfig', - name='id', - field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), - ), - migrations.AlterField( - model_name='log', - name='id', - field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), - ), - migrations.AlterField( - model_name='objectaccess', - name='id', - field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), - ), - migrations.AlterField( - model_name='user', - name='first_name', - field=models.CharField(blank=True, max_length=150, verbose_name='first name'), - ), - migrations.AlterField( - model_name='user', - name='id', - field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), - ), - migrations.AlterField( - model_name='user', - name='language', - field=models.CharField(choices=[('br', 'breton'), ('cs', 'čeština'), ('de', 'deutsch'), ('en', 'english'), ('el', 'ελληνικά'), ('es', 'español'), ('fr', 'français'), ('it', 'italiano'), ('ja', '日本の'), ('nl', 'nederlands'), ('pt', 'português'), ('pt-br', 'português (BR)'), ('pl', 'polski'), ('ro', 'Română'), ('ru', 'русский'), ('sv', 'svenska'), ('tr', 'türk'), ('zh-hant', '中文（台灣）')], default='en', help_text='Prefered language to display pages.', max_length=10, verbose_name='language'), - ), - ] diff --git a/modoboa/core/migrations/0023_auto_20221012_0911.py b/modoboa/core/migrations/0023_auto_20221012_0911.py new file mode 100644 index 000000000..65a4d6699 --- /dev/null +++ b/modoboa/core/migrations/0023_auto_20221012_0911.py @@ -0,0 +1,23 @@ +# Generated by Django 3.2.13 on 2022-10-12 09:11 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0022_user_tfa_enabled'), + ] + + operations = [ + migrations.AlterField( + model_name='user', + name='first_name', + field=models.CharField(blank=True, max_length=150, verbose_name='first name'), + ), + migrations.AlterField( + model_name='user', + name='language', + field=models.CharField(choices=[('br', 'breton'), ('cs', 'čeština'), ('de', 'deutsch'), ('en', 'english'), ('el', 'ελληνικά'), ('es', 'español'), ('fr', 'français'), ('it', 'italiano'), ('ja', '日本の'), ('nl', 'nederlands'), ('pt', 'português'), ('pt-br', 'português (BR)'), ('pl', 'polski'), ('ro', 'Română'), ('ru', 'русский'), ('sv', 'svenska'), ('tr', 'türk'), ('zh-hant', '中文（台灣）')], default='en', help_text='Prefered language to display pages.', max_length=10, verbose_name='language'), + ), + ] diff --git a/modoboa/dnstools/apps.py b/modoboa/dnstools/apps.py index c520d7b2d..cc7cbcead 100644 --- a/modoboa/dnstools/apps.py +++ b/modoboa/dnstools/apps.py @@ -2,5 +2,4 @@ from django.apps import AppConfig class DnstoolsConfig(AppConfig): - default_auto_field = 'django.db.models.BigAutoField' name = 'modoboa.dnstools' diff --git a/modoboa/dnstools/migrations/0002_alter_dnsrecord_id.py b/modoboa/dnstools/migrations/0002_alter_dnsrecord_id.py deleted file mode 100644 index 2c638db23..000000000 --- a/modoboa/dnstools/migrations/0002_alter_dnsrecord_id.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.2.12 on 2022-09-26 07:13 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('dnstools', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='dnsrecord', - name='id', - field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), - ), - ] diff --git a/modoboa/limits/apps.py b/modoboa/limits/apps.py index 8d3705f1b..a2f32805b 100644 --- a/modoboa/limits/apps.py +++ b/modoboa/limits/apps.py @@ -20,7 +20,6 @@ def load_limits_settings(): class LimitsConfig(AppConfig): """App configuration.""" - default_auto_field = "django.db.models.BigAutoField" name = "modoboa.limits" verbose_name = "Modoboa admin limits" diff --git a/modoboa/limits/migrations/0007_auto_20220926_0913.py b/modoboa/limits/migrations/0007_auto_20220926_0913.py deleted file mode 100644 index d14bf0a9a..000000000 --- a/modoboa/limits/migrations/0007_auto_20220926_0913.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 3.2.12 on 2022-09-26 07:13 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('limits', '0006_auto_20170216_1112'), - ] - - operations = [ - migrations.AlterField( - model_name='domainobjectlimit', - name='id', - field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), - ), - migrations.AlterField( - model_name='userobjectlimit', - name='id', - field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), - ), - ] diff --git a/modoboa/maillog/apps.py b/modoboa/maillog/apps.py index f93bb1450..c4f62c1a5 100644 --- a/modoboa/maillog/apps.py +++ b/modoboa/maillog/apps.py @@ -8,7 +8,6 @@ from .forms import load_settings class MaillogConfig(AppConfig): """App configuration.""" - default_auto_field = "django.db.models.BigAutoField" name = "modoboa.maillog" verbose_name = "Modoboa graphical statistics" diff --git a/modoboa/maillog/migrations/0004_alter_maillog_id.py b/modoboa/maillog/migrations/0004_alter_maillog_id.py deleted file mode 100644 index 6e77109e2..000000000 --- a/modoboa/maillog/migrations/0004_alter_maillog_id.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.2.12 on 2022-09-26 07:13 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('maillog', '0003_auto_20211108_1652'), - ] - - operations = [ - migrations.AlterField( - model_name='maillog', - name='id', - field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), - ), - ] diff --git a/modoboa/relaydomains/apps.py b/modoboa/relaydomains/apps.py index 1c3746c5c..d36faaa97 100644 --- a/modoboa/relaydomains/apps.py +++ b/modoboa/relaydomains/apps.py @@ -6,7 +6,6 @@ from django.apps import AppConfig class RelayDomainsConfig(AppConfig): """App configuration.""" - default_auto_field = "django.db.models.BigAutoField" name = "modoboa.relaydomains" verbose_name = "Modoboa relay domains" diff --git a/modoboa/relaydomains/migrations/0010_alter_recipientaccess_id.py b/modoboa/relaydomains/migrations/0010_alter_recipientaccess_id.py deleted file mode 100644 index 2ec49cb23..000000000 --- a/modoboa/relaydomains/migrations/0010_alter_recipientaccess_id.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.2.12 on 2022-09-26 07:13 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('relaydomains', '0009_auto_20171124_1508'), - ] - - operations = [ - migrations.AlterField( - model_name='recipientaccess', - name='id', - field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), - ), - ] diff --git a/modoboa/transport/apps.py b/modoboa/transport/apps.py index 539e5c047..5beae6d6d 100644 --- a/modoboa/transport/apps.py +++ b/modoboa/transport/apps.py @@ -2,7 +2,6 @@ from django.apps import AppConfig class TransportConfig(AppConfig): - default_auto_field = "django.db.models.BigAutoField" name = "modoboa.transport" def ready(self): diff --git a/modoboa/transport/migrations/0003_alter_transport_id.py b/modoboa/transport/migrations/0003_alter_transport_id.py deleted file mode 100644 index e34a119f2..000000000 --- a/modoboa/transport/migrations/0003_alter_transport_id.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.2.12 on 2022-09-26 07:13 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('transport', '0002_auto_20180928_1520'), - ] - - operations = [ - migrations.AlterField( - model_name='transport', - name='id', - field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'), - ), - ] diff --git a/test_project/test_project/settings.py b/test_project/test_project/settings.py index e51843b87..e701cb6fb 100644 --- a/test_project/test_project/settings.py +++ b/test_project/test_project/settings.py @@ -36,6 +36,8 @@ INTERNAL_IPS = ['127.0.0.1'] SITE_ID = 1 +DEFAULT_AUTO_FIELD = 'django.db.models.AutoField' + # A list of all the people who get code error notifications. When DEBUG=False # and a view raises an exception, Django will email these people with the full # exception information.