diff --git a/AUTHORS.txt b/AUTHORS.txt index 8583fb226a71fffba2ee2c4cc972b8e7c8aa701f..521c39b6607e7f29dcf69564759587c9f5502542 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 64477cf29211637d0eddbb4f4004ba5a337aab48..3f262a6347da4a5fbac352d050c1fa0a409f7b75 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 0000000000000000000000000000000000000000..5159548af1638ff78ac3a0401b33e3c0484b0845 --- /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 05910d88d17989423a90dbb448e93dee49067f3c..3b1b41e5b6d152e7b94390daab0954cb8d924ab8 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."""