diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2023-11-15 16:38:21 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2024-04-16 16:38:32 +0200 |
| commit | cae4e05f79e1deda459fc72c50a4d5594e7e4d10 (patch) | |
| tree | e3c97ad2a80007ebe2882157c005bd8b695a0cd9 /ishtar_common | |
| parent | 90dd4189664694779ce474757e9c88da5ab2ac6e (diff) | |
| download | Ishtar-cae4e05f79e1deda459fc72c50a4d5594e7e4d10.tar.bz2 Ishtar-cae4e05f79e1deda459fc72c50a4d5594e7e4d10.zip | |
🗃️ imports: merge migrations
Diffstat (limited to 'ishtar_common')
| -rw-r--r-- | ishtar_common/migrations/0231_auto_20231115_1616.py (renamed from ishtar_common/migrations/0230_auto_20231024_1045.py) | 9 | ||||
| -rw-r--r-- | ishtar_common/migrations/0232_default_mandatory_keys_import_permissions.py (renamed from ishtar_common/migrations/0231_default_mandatory_keys_import_permissions.py) | 2 |
2 files changed, 3 insertions, 8 deletions
diff --git a/ishtar_common/migrations/0230_auto_20231024_1045.py b/ishtar_common/migrations/0231_auto_20231115_1616.py index f9715bd65..0f692d5d2 100644 --- a/ishtar_common/migrations/0230_auto_20231024_1045.py +++ b/ishtar_common/migrations/0231_auto_20231115_1616.py @@ -1,4 +1,4 @@ -# Generated by Django 2.2.24 on 2023-10-24 10:45 +# Generated by Django 2.2.24 on 2023-11-15 16:16 import django.core.validators from django.db import migrations, models @@ -9,7 +9,7 @@ import ishtar_common.utils class Migration(migrations.Migration): dependencies = [ - ('ishtar_common', '0229_auto_20230608_1303'), + ('ishtar_common', '0230_auto_20231114_1334'), ] operations = [ @@ -117,11 +117,6 @@ class Migration(migrations.Migration): name='target', field=models.CharField(help_text='The target of the default values. Can be set to empty with "-". Use the "__" notation to pass between models.', max_length=500, verbose_name='Target'), ), - migrations.AlterField( - model_name='ishtarsiteprofile', - name='account_naming_style', - field=models.CharField(choices=[('NF', 'name.firstname'), ('FN', 'firstname.name')], default='FN', max_length=2, verbose_name='Naming style for accounts'), - ), migrations.CreateModel( name='ImportGroup', fields=[ diff --git a/ishtar_common/migrations/0231_default_mandatory_keys_import_permissions.py b/ishtar_common/migrations/0232_default_mandatory_keys_import_permissions.py index 120711f09..a465ad9a4 100644 --- a/ishtar_common/migrations/0231_default_mandatory_keys_import_permissions.py +++ b/ishtar_common/migrations/0232_default_mandatory_keys_import_permissions.py @@ -108,7 +108,7 @@ def migrate(apps, __): class Migration(migrations.Migration): dependencies = [ - ('ishtar_common', '0230_auto_20231024_1045'), + ('ishtar_common', '0231_auto_20231115_1616'), ] operations = [ |