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/0026_auto_20180423_1838.py | 53 ---------------------- .../migrations/0027_auto_20180423_1838.py | 53 ++++++++++++++++++++++ 2 files changed, 53 insertions(+), 53 deletions(-) delete mode 100644 archaeological_operations/migrations/0026_auto_20180423_1838.py create mode 100644 archaeological_operations/migrations/0027_auto_20180423_1838.py (limited to 'archaeological_operations') diff --git a/archaeological_operations/migrations/0026_auto_20180423_1838.py b/archaeological_operations/migrations/0026_auto_20180423_1838.py deleted file mode 100644 index 5b196e728..000000000 --- a/archaeological_operations/migrations/0026_auto_20180423_1838.py +++ /dev/null @@ -1,53 +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_operations', '0025_auto_20180413_1604'), - ] - - operations = [ - migrations.CreateModel( - name='OperationImage', - 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')), - ('image', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='ishtar_common.IshtarImage')), - ], - ), - migrations.CreateModel( - name='SiteImage', - 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')), - ('image', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='ishtar_common.IshtarImage')), - ('site', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='archaeological_operations.ArchaeologicalSite')), - ], - ), - migrations.RemoveField( - model_name='operation', - name='images', - ), - migrations.AddField( - model_name='operation', - name='images', - field=models.ManyToManyField(blank=True, through='archaeological_operations.OperationImage', to='ishtar_common.IshtarImage', verbose_name='Images'), - ), - migrations.AddField( - model_name='operationimage', - name='operation', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='archaeological_operations.Operation'), - ), - migrations.AddField( - model_name='archaeologicalsite', - name='images', - field=models.ManyToManyField(blank=True, through='archaeological_operations.SiteImage', to='ishtar_common.IshtarImage', verbose_name='Images'), - ), - ] diff --git a/archaeological_operations/migrations/0027_auto_20180423_1838.py b/archaeological_operations/migrations/0027_auto_20180423_1838.py new file mode 100644 index 000000000..c9af8c928 --- /dev/null +++ b/archaeological_operations/migrations/0027_auto_20180423_1838.py @@ -0,0 +1,53 @@ +# -*- 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_operations', '0026_auto_20180430_1318'), + ] + + operations = [ + migrations.CreateModel( + name='OperationImage', + 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')), + ('image', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='ishtar_common.IshtarImage')), + ], + ), + migrations.CreateModel( + name='SiteImage', + 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')), + ('image', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='ishtar_common.IshtarImage')), + ('site', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='archaeological_operations.ArchaeologicalSite')), + ], + ), + migrations.RemoveField( + model_name='operation', + name='images', + ), + migrations.AddField( + model_name='operation', + name='images', + field=models.ManyToManyField(blank=True, through='archaeological_operations.OperationImage', to='ishtar_common.IshtarImage', verbose_name='Images'), + ), + migrations.AddField( + model_name='operationimage', + name='operation', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='archaeological_operations.Operation'), + ), + migrations.AddField( + model_name='archaeologicalsite', + name='images', + field=models.ManyToManyField(blank=True, through='archaeological_operations.SiteImage', to='ishtar_common.IshtarImage', verbose_name='Images'), + ), + ] -- cgit v1.2.3