From fe5aaadccd727f61ffad6c30d983d1ad0a8d1965 Mon Sep 17 00:00:00 2001 From: Jonathan Weth <git@jonathanweth.de> Date: Fri, 23 May 2025 11:45:18 +0200 Subject: [PATCH] Fix migration history to be complete --- AUTHORS.txt | 1 + favicon/__init__.py | 2 +- favicon/migrations/0005_leftover_changes.py | 29 +++++++++++++++++++++ favicon/models.py | 8 +++--- 4 files changed, 36 insertions(+), 4 deletions(-) create mode 100644 favicon/migrations/0005_leftover_changes.py diff --git a/AUTHORS.txt b/AUTHORS.txt index 8583fb2..521c39b 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -8,3 +8,4 @@ raphaa Michał Pasternak (mpasternak) ZugBahnHof Natureshadow +hansegucker diff --git a/favicon/__init__.py b/favicon/__init__.py index 64477cf..3f262a6 100644 --- a/favicon/__init__.py +++ b/favicon/__init__.py @@ -1 +1 @@ -__version__ = '1.2' +__version__ = '1.2.1' diff --git a/favicon/migrations/0005_leftover_changes.py b/favicon/migrations/0005_leftover_changes.py new file mode 100644 index 0000000..5159548 --- /dev/null +++ b/favicon/migrations/0005_leftover_changes.py @@ -0,0 +1,29 @@ +# Generated by Django 5.2.1 on 2025-05-23 09:38 + +import favicon.models +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('favicon', '0004_faviconimg_favicon_size_rel_unique'), + ] + + operations = [ + migrations.AlterModelManagers( + name='favicon', + managers=[ + ], + ), + migrations.AlterField( + model_name='favicon', + name='faviconImage', + field=models.ImageField(upload_to=favicon.models.get_image_path), + ), + migrations.AlterField( + model_name='faviconimg', + name='faviconImage', + field=models.ImageField(upload_to=favicon.models.get_image_path), + ), + ] diff --git a/favicon/models.py b/favicon/models.py index 05910d8..3b1b41e 100644 --- a/favicon/models.py +++ b/favicon/models.py @@ -30,6 +30,8 @@ if "shortcut icon" not in config or 32 not in config["shortcut icon"]: image_path = getattr(settings, "FAVICON_PATH", "favicon") +def get_image_path(): + return image_path def pre_delete_image(sender, instance, **kwargs): instance.del_image() @@ -37,7 +39,7 @@ def pre_delete_image(sender, instance, **kwargs): class Favicon(models.Model): title = models.CharField(max_length=100) - faviconImage = models.ImageField(upload_to=image_path) + faviconImage = models.ImageField(upload_to=get_image_path) isFavicon = models.BooleanField(default=True) @@ -94,7 +96,7 @@ class Favicon(models.Model): new_favicons.append(fav) if new_favicons: FaviconImg.objects.bulk_create(new_favicons, ignore_conflicts=True) - + return list(favicons) + new_favicons def __str__(self): @@ -127,7 +129,7 @@ class FaviconImg(models.Model): faviconFK = models.ForeignKey(Favicon, on_delete=models.CASCADE) size = models.IntegerField() rel = models.CharField(max_length=250, null=True) - faviconImage = models.ImageField(upload_to=image_path) + faviconImage = models.ImageField(upload_to=get_image_path) def as_html(self): """Return a <link> tag forthis favicon image.""" -- GitLab