From 3f14d0f6481f1781d598d29b79a96fb7ee727320 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 9 May 2018 17:49:16 +0200 Subject: Standardize related field item for imagee collections (refs #4076) --- .../migrations/0017_auto_20180423_1838.py | 31 ------------------- .../migrations/0017_auto_20180509_1747.py | 35 ++++++++++++++++++++++ 2 files changed, 35 insertions(+), 31 deletions(-) delete mode 100644 archaeological_warehouse/migrations/0017_auto_20180423_1838.py create mode 100644 archaeological_warehouse/migrations/0017_auto_20180509_1747.py (limited to 'archaeological_warehouse/migrations') diff --git a/archaeological_warehouse/migrations/0017_auto_20180423_1838.py b/archaeological_warehouse/migrations/0017_auto_20180423_1838.py deleted file mode 100644 index fe183c312..000000000 --- a/archaeological_warehouse/migrations/0017_auto_20180423_1838.py +++ /dev/null @@ -1,31 +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_warehouse', '0016_auto_20180403_1120'), - ] - - operations = [ - migrations.CreateModel( - name='WarehouseImage', - 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')), - ('warehouse', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='archaeological_warehouse.Warehouse')), - ], - ), - migrations.AddField( - model_name='warehouse', - name='images', - field=models.ManyToManyField(blank=True, through='archaeological_warehouse.WarehouseImage', to='ishtar_common.IshtarImage', verbose_name='Images'), - ), - ] diff --git a/archaeological_warehouse/migrations/0017_auto_20180509_1747.py b/archaeological_warehouse/migrations/0017_auto_20180509_1747.py new file mode 100644 index 000000000..76b384374 --- /dev/null +++ b/archaeological_warehouse/migrations/0017_auto_20180509_1747.py @@ -0,0 +1,35 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.10 on 2018-05-09 17:47 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('ishtar_common', '0050_licensetype_url'), + ('archaeological_warehouse', '0016_auto_20180403_1120'), + ] + + operations = [ + migrations.CreateModel( + name='WarehouseImage', + 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')), + ('item', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='associated_images', to='archaeological_warehouse.Warehouse')), + ], + options={ + 'ordering': ('-is_main', 'image__name'), + 'abstract': False, + }, + ), + migrations.AddField( + model_name='warehouse', + name='images', + field=models.ManyToManyField(blank=True, through='archaeological_warehouse.WarehouseImage', to='ishtar_common.IshtarImage', verbose_name='Images'), + ), + ] -- cgit v1.2.3