From 36769322b4b11e148f66c6ce67aa86d3f0cc1348 Mon Sep 17 00:00:00 2001 From: Commander1024 Date: Tue, 28 Jul 2020 21:43:19 +0200 Subject: [PATCH] Reset migrations after fuckery cause by changing AuthUserModel. --- .../lostplaces_app/migrations/0001_initial.py | 44 ++++++++++++++++++- .../migrations/0002_placeimage.py | 23 ---------- .../migrations/0003_auto_20200727_1801.py | 18 -------- .../migrations/0004_auto_20200727_1803.py | 19 -------- .../migrations/0005_auto_20200728_0738.py | 20 --------- source/lostplaces/lostplaces_app/models.py | 5 +-- 6 files changed, 45 insertions(+), 84 deletions(-) delete mode 100644 source/lostplaces/lostplaces_app/migrations/0002_placeimage.py delete mode 100644 source/lostplaces/lostplaces_app/migrations/0003_auto_20200727_1801.py delete mode 100644 source/lostplaces/lostplaces_app/migrations/0004_auto_20200727_1803.py delete mode 100644 source/lostplaces/lostplaces_app/migrations/0005_auto_20200728_0738.py diff --git a/source/lostplaces/lostplaces_app/migrations/0001_initial.py b/source/lostplaces/lostplaces_app/migrations/0001_initial.py index 76ff7bf..849b522 100644 --- a/source/lostplaces/lostplaces_app/migrations/0001_initial.py +++ b/source/lostplaces/lostplaces_app/migrations/0001_initial.py @@ -1,6 +1,12 @@ -# Generated by Django 3.0.8 on 2020-07-18 20:12 +# Generated by Django 3.0.8 on 2020-07-28 19:00 +import django.contrib.auth.models +import django.contrib.auth.validators from django.db import migrations, models +import django.db.models.deletion +import django.utils.timezone +import django_thumbs.fields +import lostplaces_app.models class Migration(migrations.Migration): @@ -8,6 +14,7 @@ class Migration(migrations.Migration): initial = True dependencies = [ + ('auth', '0011_update_proxy_permissions'), ] operations = [ @@ -22,4 +29,39 @@ class Migration(migrations.Migration): ('description', models.TextField()), ], ), + migrations.CreateModel( + name='PlaceImage', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('filename', django_thumbs.fields.ImageThumbsField(max_length=50, sizes=({'code': 'thumbnail', 'wxh': '390x390'}, {'code': 'hero', 'wxh': '700x700'}, {'code': 'large', 'wxh': '1920x1920'}), upload_to=lostplaces_app.models.generate_image_upload_path)), + ('description', models.TextField(blank=True)), + ('place', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='images', to='lostplaces_app.Place')), + ], + ), + migrations.CreateModel( + name='Explorer', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('password', models.CharField(max_length=128, verbose_name='password')), + ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')), + ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')), + ('username', models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username')), + ('first_name', models.CharField(blank=True, max_length=30, verbose_name='first name')), + ('last_name', models.CharField(blank=True, max_length=150, verbose_name='last name')), + ('email', models.EmailField(blank=True, max_length=254, verbose_name='email address')), + ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')), + ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')), + ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')), + ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.Group', verbose_name='groups')), + ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.Permission', verbose_name='user permissions')), + ], + options={ + 'verbose_name': 'user', + 'verbose_name_plural': 'users', + 'abstract': False, + }, + managers=[ + ('objects', django.contrib.auth.models.UserManager()), + ], + ), ] diff --git a/source/lostplaces/lostplaces_app/migrations/0002_placeimage.py b/source/lostplaces/lostplaces_app/migrations/0002_placeimage.py deleted file mode 100644 index dac2ddd..0000000 --- a/source/lostplaces/lostplaces_app/migrations/0002_placeimage.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 3.0.8 on 2020-07-27 17:58 - -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('lostplaces_app', '0001_initial'), - ] - - operations = [ - migrations.CreateModel( - name='PlaceImage', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('filename', models.ImageField(max_length=50, upload_to='places/%Y/%m/')), - ('description', models.TextField()), - ('place', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='images', to='lostplaces_app.Place')), - ], - ), - ] diff --git a/source/lostplaces/lostplaces_app/migrations/0003_auto_20200727_1801.py b/source/lostplaces/lostplaces_app/migrations/0003_auto_20200727_1801.py deleted file mode 100644 index 0373521..0000000 --- a/source/lostplaces/lostplaces_app/migrations/0003_auto_20200727_1801.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 3.0.8 on 2020-07-27 18:01 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('lostplaces_app', '0002_placeimage'), - ] - - operations = [ - migrations.AlterField( - model_name='placeimage', - name='description', - field=models.TextField(null=True), - ), - ] diff --git a/source/lostplaces/lostplaces_app/migrations/0004_auto_20200727_1803.py b/source/lostplaces/lostplaces_app/migrations/0004_auto_20200727_1803.py deleted file mode 100644 index 8b9c753..0000000 --- a/source/lostplaces/lostplaces_app/migrations/0004_auto_20200727_1803.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 3.0.8 on 2020-07-27 18:03 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('lostplaces_app', '0003_auto_20200727_1801'), - ] - - operations = [ - migrations.AlterField( - model_name='placeimage', - name='description', - field=models.TextField(blank=True, default=''), - preserve_default=False, - ), - ] diff --git a/source/lostplaces/lostplaces_app/migrations/0005_auto_20200728_0738.py b/source/lostplaces/lostplaces_app/migrations/0005_auto_20200728_0738.py deleted file mode 100644 index d0abd4a..0000000 --- a/source/lostplaces/lostplaces_app/migrations/0005_auto_20200728_0738.py +++ /dev/null @@ -1,20 +0,0 @@ -# Generated by Django 3.0.8 on 2020-07-28 07:38 - -from django.db import migrations -import django_thumbs.fields -import lostplaces_app.models - - -class Migration(migrations.Migration): - - dependencies = [ - ('lostplaces_app', '0004_auto_20200727_1803'), - ] - - operations = [ - migrations.AlterField( - model_name='placeimage', - name='filename', - field=django_thumbs.fields.ImageThumbsField(max_length=50, sizes=({'code': 'thumbnail', 'wxh': '390x390'}, {'code': 'hero', 'wxh': '700x700'}, {'code': 'large', 'wxh': '1920x1920'}), upload_to=lostplaces_app.models.generate_image_upload_path), - ), - ] diff --git a/source/lostplaces/lostplaces_app/models.py b/source/lostplaces/lostplaces_app/models.py index 426ad0b..270f12f 100644 --- a/source/lostplaces/lostplaces_app/models.py +++ b/source/lostplaces/lostplaces_app/models.py @@ -8,9 +8,8 @@ from django_thumbs.fields import ImageThumbsField # Create your models here. -# Usermodel +# Custom user model class Explorer(AbstractUser): - pass # add additional fields in here def __str__(self): @@ -35,7 +34,7 @@ class PlaceImage (models.Model): filename = ImageThumbsField( upload_to=generate_image_upload_path, max_length=50, - sizes = ( + sizes=( {'code': 'thumbnail', 'wxh': '390x390'}, {'code': 'hero', 'wxh': '700x700'}, {'code': 'large', 'wxh': '1920x1920'}