Fixes merge for migration numbers

This commit is contained in:
Mouse Reeve 2020-03-30 15:45:11 -07:00
parent 5c4d078f92
commit 8101321871
2 changed files with 17 additions and 30 deletions

View file

@ -1,28 +0,0 @@
# Generated by Django 3.0.3 on 2020-03-30 19:43
from django.db import migrations, models
import fedireads.utils.fields
class Migration(migrations.Migration):
dependencies = [
('fedireads', '0025_auto_20200330_0037'),
]
operations = [
migrations.RemoveField(
model_name='book',
name='language',
),
migrations.AddField(
model_name='book',
name='languages',
field=fedireads.utils.fields.ArrayField(base_field=models.CharField(max_length=255), blank=True, default=list, size=None),
),
migrations.AddField(
model_name='edition',
name='default',
field=models.BooleanField(default=False),
),
]

View file

@ -1,16 +1,21 @@
# Generated by Django 3.0.3 on 2020-03-30 20:42 # Generated by Django 3.0.3 on 2020-03-30 22:32
from django.db import migrations, models from django.db import migrations, models
import django.db.models.deletion import django.db.models.deletion
import fedireads.utils.fields
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('fedireads', '0026_auto_20200330_1943'), ('fedireads', '0026_auto_20200330_1456'),
] ]
operations = [ operations = [
migrations.RemoveField(
model_name='book',
name='language',
),
migrations.RemoveField( migrations.RemoveField(
model_name='book', model_name='book',
name='parent_work', name='parent_work',
@ -19,6 +24,16 @@ class Migration(migrations.Migration):
model_name='book', model_name='book',
name='shelves', name='shelves',
), ),
migrations.AddField(
model_name='book',
name='languages',
field=fedireads.utils.fields.ArrayField(base_field=models.CharField(max_length=255), blank=True, default=list, size=None),
),
migrations.AddField(
model_name='edition',
name='default',
field=models.BooleanField(default=False),
),
migrations.AddField( migrations.AddField(
model_name='edition', model_name='edition',
name='parent_work', name='parent_work',