diff --git a/django_lostplaces/lostplaces/migrations/0001_initial.py b/django_lostplaces/lostplaces/migrations/0001_initial.py index d0ec5d3..2da1dc5 100644 --- a/django_lostplaces/lostplaces/migrations/0001_initial.py +++ b/django_lostplaces/lostplaces/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 3.1.1 on 2020-09-28 18:39 +# Generated by Django 3.1.1 on 2020-11-29 17:46 from django.conf import settings import django.core.validators @@ -14,19 +14,11 @@ class Migration(migrations.Migration): initial = True dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), ('taggit', '0003_taggeditem_add_unique_index'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] operations = [ - migrations.CreateModel( - name='Expireable', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('created_when', models.DateTimeField(auto_now_add=True)), - ('expires_when', models.DateTimeField()), - ], - ), migrations.CreateModel( name='Explorer', fields=[ @@ -38,13 +30,13 @@ class Migration(migrations.Migration): name='Place', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=50)), - ('latitude', models.FloatField(validators=[django.core.validators.MinValueValidator(-90), django.core.validators.MaxValueValidator(90)])), - ('longitude', models.FloatField(validators=[django.core.validators.MinValueValidator(-180), django.core.validators.MaxValueValidator(180)])), - ('submitted_when', models.DateTimeField(auto_now_add=True, null=True)), - ('location', models.CharField(max_length=50)), - ('description', models.TextField()), - ('submitted_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='places', to='lostplaces.explorer')), + ('name', models.CharField(max_length=50, verbose_name='Name')), + ('latitude', models.FloatField(help_text='Latitude in decimal format: e. g. 41.40338', validators=[django.core.validators.MinValueValidator(-90), django.core.validators.MaxValueValidator(90)], verbose_name='Latitude')), + ('longitude', models.FloatField(help_text='Longitude in decimal format: e. g. 2.17403', validators=[django.core.validators.MinValueValidator(-180), django.core.validators.MaxValueValidator(180)], verbose_name='Longitude')), + ('submitted_when', models.DateTimeField(auto_now_add=True, null=True, verbose_name='Submission date')), + ('location', models.CharField(max_length=50, verbose_name='Location')), + ('description', models.TextField(help_text="Description of the place: e.g. how to get there, where to be careful, the place's history...", verbose_name='Description')), + ('submitted_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='places', to='lostplaces.explorer', verbose_name='Submitter')), ('tags', taggit.managers.TaggableManager(blank=True, help_text='A comma-separated list of tags.', through='taggit.TaggedItem', to='taggit.Tag', verbose_name='Tags')), ], options={ @@ -54,20 +46,24 @@ class Migration(migrations.Migration): migrations.CreateModel( name='Voucher', fields=[ - ('expireable_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='lostplaces.expireable')), + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('created_when', models.DateTimeField(auto_now_add=True, verbose_name='Creation date')), + ('expires_when', models.DateTimeField(verbose_name='Expiration date')), ('code', models.CharField(max_length=30, unique=True)), ], - bases=('lostplaces.expireable',), + options={ + 'abstract': False, + }, ), migrations.CreateModel( name='PlaceImage', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('submitted_when', models.DateTimeField(auto_now_add=True, null=True)), - ('description', models.TextField(blank=True)), - ('filename', easy_thumbnails.fields.ThumbnailerImageField(upload_to=lostplaces.models.place.generate_image_upload_path)), + ('submitted_when', models.DateTimeField(auto_now_add=True, null=True, verbose_name='Submission date')), + ('description', models.TextField(blank=True, verbose_name='Description')), + ('filename', easy_thumbnails.fields.ThumbnailerImageField(help_text='Optional: One or more images to upload', upload_to=lostplaces.models.place.generate_image_upload_path, verbose_name='Filename(s)')), ('place', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='placeimages', to='lostplaces.place')), - ('submitted_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='placeimages', to='lostplaces.explorer')), + ('submitted_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='placeimages', to='lostplaces.explorer', verbose_name='Submitter')), ], options={ 'abstract': False, @@ -77,11 +73,11 @@ class Migration(migrations.Migration): name='PhotoAlbum', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('submitted_when', models.DateTimeField(auto_now_add=True, null=True)), - ('url', models.URLField()), - ('label', models.CharField(max_length=100)), + ('submitted_when', models.DateTimeField(auto_now_add=True, null=True, verbose_name='Submission date')), + ('url', models.URLField(verbose_name='URL')), + ('label', models.CharField(max_length=100, verbose_name='link text')), ('place', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='photoalbums', to='lostplaces.place')), - ('submitted_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='photoalbums', to='lostplaces.explorer')), + ('submitted_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='photoalbums', to='lostplaces.explorer', verbose_name='Submitter')), ], options={ 'abstract': False, diff --git a/django_lostplaces/lostplaces/migrations/0002_remove_vouchers.py b/django_lostplaces/lostplaces/migrations/0002_remove_vouchers.py deleted file mode 100644 index 76a1aaf..0000000 --- a/django_lostplaces/lostplaces/migrations/0002_remove_vouchers.py +++ /dev/null @@ -1,22 +0,0 @@ -# Generated by Django 3.1.1 on 2020-10-04 19:37 -# Edited by reverend - -import datetime -from django.db import migrations, models -import django.utils.timezone -from django.utils.timezone import utc - -class Migration(migrations.Migration): - - dependencies = [ - ('lostplaces', '0001_initial'), - ] - - operations = [ - migrations.DeleteModel( - name='Voucher' - ), - migrations.DeleteModel( - name='Expireable' - ) - ] diff --git a/django_lostplaces/lostplaces/migrations/0003_voucher.py b/django_lostplaces/lostplaces/migrations/0003_voucher.py deleted file mode 100644 index 6fd6747..0000000 --- a/django_lostplaces/lostplaces/migrations/0003_voucher.py +++ /dev/null @@ -1,25 +0,0 @@ -# Generated by Django 3.1.1 on 2020-10-04 19:52 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('lostplaces', '0002_remove_vouchers'), - ] - - operations = [ - migrations.CreateModel( - name='Voucher', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('created_when', models.DateTimeField(auto_now_add=True)), - ('expires_when', models.DateTimeField()), - ('code', models.CharField(max_length=30, unique=True)), - ], - options={ - 'abstract': False, - }, - ), - ]