From 929ff43d546e7c6cb5b12f6c9b522f119a8a26ef Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 7 May 2018 17:47:09 +0200 Subject: Merge migrations --- .../migrations/0020_auto_20180423_1838.py | 43 ---------------------- .../migrations/0021_auto_20180423_1838.py | 43 ++++++++++++++++++++++ 2 files changed, 43 insertions(+), 43 deletions(-) delete mode 100644 archaeological_context_records/migrations/0020_auto_20180423_1838.py create mode 100644 archaeological_context_records/migrations/0021_auto_20180423_1838.py (limited to 'archaeological_context_records/migrations') diff --git a/archaeological_context_records/migrations/0020_auto_20180423_1838.py b/archaeological_context_records/migrations/0020_auto_20180423_1838.py deleted file mode 100644 index 11995b0c6..000000000 --- a/archaeological_context_records/migrations/0020_auto_20180423_1838.py +++ /dev/null @@ -1,43 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.10 on 2018-04-23 18:38 -from __future__ import unicode_literals - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('ishtar_common', '0048_auto_20180423_1838'), - ('archaeological_context_records', '0019_auto_20180403_1120'), - ] - - operations = [ - migrations.CreateModel( - name='ContextRecordImage', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('is_main', models.BooleanField(default=False, verbose_name='Main image')), - ], - ), - migrations.RemoveField( - model_name='contextrecord', - name='images', - ), - migrations.AddField( - model_name='contextrecord', - name='images', - field=models.ManyToManyField(blank=True, through='archaeological_context_records.ContextRecordImage', to='ishtar_common.IshtarImage', verbose_name='Images'), - ), - migrations.AddField( - model_name='contextrecordimage', - name='context_record', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='archaeological_context_records.ContextRecord'), - ), - migrations.AddField( - model_name='contextrecordimage', - name='image', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='ishtar_common.IshtarImage'), - ), - ] diff --git a/archaeological_context_records/migrations/0021_auto_20180423_1838.py b/archaeological_context_records/migrations/0021_auto_20180423_1838.py new file mode 100644 index 000000000..c26e46c07 --- /dev/null +++ b/archaeological_context_records/migrations/0021_auto_20180423_1838.py @@ -0,0 +1,43 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.10 on 2018-04-23 18:38 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('ishtar_common', '0048_auto_20180423_1838'), + ('archaeological_context_records', '0020_auto_20180430_1318'), + ] + + operations = [ + migrations.CreateModel( + name='ContextRecordImage', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('is_main', models.BooleanField(default=False, verbose_name='Main image')), + ], + ), + migrations.RemoveField( + model_name='contextrecord', + name='images', + ), + migrations.AddField( + model_name='contextrecord', + name='images', + field=models.ManyToManyField(blank=True, through='archaeological_context_records.ContextRecordImage', to='ishtar_common.IshtarImage', verbose_name='Images'), + ), + migrations.AddField( + model_name='contextrecordimage', + name='context_record', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='archaeological_context_records.ContextRecord'), + ), + migrations.AddField( + model_name='contextrecordimage', + name='image', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='ishtar_common.IshtarImage'), + ), + ] -- cgit v1.2.3