From c91aa4be475fac06e6d4b55804fac4debc5c1dbf Mon Sep 17 00:00:00 2001 From: Philip Sargent Date: Wed, 24 Jun 2020 00:18:01 +0100 Subject: Simple renaming too-similar variables --- core/migrations/0001_initial.py | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) (limited to 'core/migrations/0001_initial.py') diff --git a/core/migrations/0001_initial.py b/core/migrations/0001_initial.py index 6a8a847..d2b09f2 100644 --- a/core/migrations/0001_initial.py +++ b/core/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.11.29 on 2020-06-23 18:44 +# Generated by Django 1.11.29 on 2020-06-23 22:48 from __future__ import unicode_literals from django.conf import settings @@ -307,6 +307,18 @@ class Migration(migrations.Migration): 'ordering': ('walletname',), }, ), + migrations.CreateModel( + name='SingleScan', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('ffile', models.CharField(max_length=200)), + ('name', models.CharField(max_length=200)), + ('scansfolder', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='core.ScansFolder')), + ], + options={ + 'ordering': ('name',), + }, + ), migrations.CreateModel( name='SurvexBlock', fields=[ @@ -322,6 +334,7 @@ class Migration(migrations.Migration): ('expedition', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='core.Expedition')), ('expeditionday', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='core.ExpeditionDay')), ('parent', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='core.SurvexBlock')), + ('scansfolder', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='core.ScansFolder')), ], options={ 'ordering': ('id',), @@ -370,18 +383,6 @@ class Migration(migrations.Migration): ('survexblock', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='core.SurvexBlock')), ], ), - migrations.CreateModel( - name='SurvexScanSingle', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('ffile', models.CharField(max_length=200)), - ('name', models.CharField(max_length=200)), - ('scansfolder', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='core.ScansFolder')), - ], - options={ - 'ordering': ('name',), - }, - ), migrations.CreateModel( name='SurvexStation', fields=[ @@ -414,7 +415,7 @@ class Migration(migrations.Migration): ('npaths', models.IntegerField(default=0)), ('manyscansfolders', models.ManyToManyField(to='core.ScansFolder')), ('survexblocks', models.ManyToManyField(to='core.SurvexBlock')), - ('survexscans', models.ManyToManyField(to='core.SurvexScanSingle')), + ('survexscans', models.ManyToManyField(to='core.SingleScan')), ('survextitles', models.ManyToManyField(to='core.SurvexTitle')), ('tunnelcontains', models.ManyToManyField(to='core.TunnelFile')), ], @@ -432,11 +433,6 @@ class Migration(migrations.Migration): name='survexfile', field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='core.SurvexFile'), ), - migrations.AddField( - model_name='survexblock', - name='scansfolder', - field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='core.ScansFolder'), - ), migrations.AddField( model_name='qm', name='nearest_station', -- cgit v1.2.3