diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f9cddec..24931b29 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,10 @@ and this project adheres to - 🔒️(backend) enhance API input validation to strengthen security #1053 +### Fixed + +- 🐛(migrations) use settings in migrations #1058 + ## [1.9.0] - 2026-03-02 ### Added diff --git a/src/backend/core/migrations/0001_initial.py b/src/backend/core/migrations/0001_initial.py index 384d6024..155761a9 100644 --- a/src/backend/core/migrations/0001_initial.py +++ b/src/backend/core/migrations/0001_initial.py @@ -44,7 +44,7 @@ class Migration(migrations.Migration): ('sub', models.CharField(blank=True, help_text='Optional for pending users; required upon account activation. 255 characters or fewer. Letters, numbers, and @/./+/-/_ characters only.', max_length=255, null=True, unique=True, validators=[django.core.validators.RegexValidator(message='Enter a valid sub. This value may contain only letters, numbers, and @/./+/-/_ characters.', regex='^[\\w.@+-]+\\Z')], verbose_name='sub')), ('email', models.EmailField(blank=True, max_length=254, null=True, verbose_name='identity email address')), ('admin_email', models.EmailField(blank=True, max_length=254, null=True, unique=True, verbose_name='admin email address')), - ('language', models.CharField(choices="(('en-us', 'English'), ('fr-fr', 'French'))", default='en-us', help_text='The language in which the user wants to see the interface.', max_length=10, verbose_name='language')), + ('language', models.CharField(choices=settings.LANGUAGES, default=settings.LANGUAGE_CODE, help_text='The language in which the user wants to see the interface.', max_length=10, verbose_name='language')), ('timezone', timezone_field.fields.TimeZoneField(choices_display='WITH_GMT_OFFSET', default='UTC', help_text='The timezone in which the user wants to see times.', use_pytz=False)), ('is_device', models.BooleanField(default=False, help_text='Whether the user is a device or a real user.', verbose_name='device')), ('is_staff', models.BooleanField(default=False, help_text='Whether the user can log into this admin site.', verbose_name='staff status')), @@ -96,7 +96,7 @@ class Migration(migrations.Migration): migrations.AddField( model_name='resource', name='users', - field=models.ManyToManyField(related_name='resources', through='core.ResourceAccess', to=settings.AUTH_USER_MODEL), + field=models.ManyToManyField(related_name='resources', through='core.ResourceAccess', through_fields=('resource', 'user'), to=settings.AUTH_USER_MODEL), ), migrations.AddConstraint( model_name='resourceaccess', diff --git a/src/backend/core/migrations/0004_alter_user_language.py b/src/backend/core/migrations/0004_alter_user_language.py index e562bc67..c8383601 100644 --- a/src/backend/core/migrations/0004_alter_user_language.py +++ b/src/backend/core/migrations/0004_alter_user_language.py @@ -1,5 +1,5 @@ # Generated by Django 5.0.7 on 2024-08-07 14:39 - +from django.conf import settings from django.db import migrations, models @@ -13,6 +13,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='user', name='language', - field=models.CharField(choices="(('en-us', 'English'), ('fr-fr', 'French'))", default='en-us', help_text='The language in which the user wants to see the interface.', max_length=10, verbose_name='language'), + field=models.CharField(choices=settings.LANGUAGES, default=settings.LANGUAGE_CODE, help_text='The language in which the user wants to see the interface.', max_length=10, verbose_name='language'), ), ] diff --git a/src/backend/core/migrations/0013_alter_user_language.py b/src/backend/core/migrations/0013_alter_user_language.py index 61303cde..cdba1f48 100644 --- a/src/backend/core/migrations/0013_alter_user_language.py +++ b/src/backend/core/migrations/0013_alter_user_language.py @@ -1,5 +1,5 @@ # Generated by Django 5.1.8 on 2025-04-22 14:52 - +from django.conf import settings from django.db import migrations, models @@ -13,6 +13,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='user', name='language', - field=models.CharField(choices="(('en-us', 'English'), ('fr-fr', 'French'), ('nl-nl', 'Dutch'))", default='en-us', help_text='The language in which the user wants to see the interface.', max_length=10, verbose_name='language'), + field=models.CharField(choices=settings.LANGUAGES, default=settings.LANGUAGE_CODE, help_text='The language in which the user wants to see the interface.', max_length=10, verbose_name='language'), ), ]