Merge migrations

PyBAQ · Aug 12, 2023 · 7a70459 · 7a70459
1 parent 5c3614e
commit 7a70459
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 42 deletions.
diff --git a/...rs/migrations/0002_user_bio_user_phone.py → ...ns/0002_user_bio_user_image_user_phone.py b/...rs/migrations/0002_user_bio_user_phone.py → ...ns/0002_user_bio_user_image_user_phone.py
@@ -1,6 +1,7 @@
-# Generated by Django 4.1.8 on 2023-08-12 01:57
+# Generated by Django 4.1.8 on 2023-08-12 16:41
 
 from django.db import migrations, models
+import temii.users.models
 
 
 class Migration(migrations.Migration):
@@ -11,12 +12,19 @@ class Migration(migrations.Migration):
     operations = [
         migrations.AddField(
             model_name="user",
-            name="phone",
-            field=models.CharField(blank=True, max_length=20, verbose_name="Phone"),
+            name="bio",
+            field=models.CharField(blank=True, max_length=255, verbose_name="Bio"),
         ),
         migrations.AddField(
             model_name="user",
-            name="bio",
-            field=models.CharField(blank=True, max_length=255, verbose_name="Bio"),
+            name="image",
+            field=models.ImageField(
+                default="default.jpg", upload_to=temii.users.models.upload_to, verbose_name="Image"
+            ),
+        ),
+        migrations.AddField(
+            model_name="user",
+            name="phone",
+            field=models.CharField(blank=True, max_length=50, verbose_name="Phone"),
         ),
     ]
diff --git a/temii/users/migrations/0003_user_image.py b/temii/users/migrations/0003_user_image.py
diff --git a/temii/users/migrations/0004_alter_user_phone.py b/temii/users/migrations/0004_alter_user_phone.py