Skip to content
Snippets Groups Projects
Verified Commit fe5aaadc authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Fix migration history to be complete

parent 461f89e1
No related branches found
No related tags found
No related merge requests found
...@@ -8,3 +8,4 @@ raphaa ...@@ -8,3 +8,4 @@ raphaa
Michał Pasternak (mpasternak) Michał Pasternak (mpasternak)
ZugBahnHof ZugBahnHof
Natureshadow Natureshadow
hansegucker
__version__ = '1.2' __version__ = '1.2.1'
# 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),
),
]
...@@ -30,6 +30,8 @@ if "shortcut icon" not in config or 32 not in config["shortcut icon"]: ...@@ -30,6 +30,8 @@ if "shortcut icon" not in config or 32 not in config["shortcut icon"]:
image_path = getattr(settings, "FAVICON_PATH", "favicon") image_path = getattr(settings, "FAVICON_PATH", "favicon")
def get_image_path():
return image_path
def pre_delete_image(sender, instance, **kwargs): def pre_delete_image(sender, instance, **kwargs):
instance.del_image() instance.del_image()
...@@ -37,7 +39,7 @@ def pre_delete_image(sender, instance, **kwargs): ...@@ -37,7 +39,7 @@ def pre_delete_image(sender, instance, **kwargs):
class Favicon(models.Model): class Favicon(models.Model):
title = models.CharField(max_length=100) 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) isFavicon = models.BooleanField(default=True)
...@@ -94,7 +96,7 @@ class Favicon(models.Model): ...@@ -94,7 +96,7 @@ class Favicon(models.Model):
new_favicons.append(fav) new_favicons.append(fav)
if new_favicons: if new_favicons:
FaviconImg.objects.bulk_create(new_favicons, ignore_conflicts=True) FaviconImg.objects.bulk_create(new_favicons, ignore_conflicts=True)
return list(favicons) + new_favicons return list(favicons) + new_favicons
def __str__(self): def __str__(self):
...@@ -127,7 +129,7 @@ class FaviconImg(models.Model): ...@@ -127,7 +129,7 @@ class FaviconImg(models.Model):
faviconFK = models.ForeignKey(Favicon, on_delete=models.CASCADE) faviconFK = models.ForeignKey(Favicon, on_delete=models.CASCADE)
size = models.IntegerField() size = models.IntegerField()
rel = models.CharField(max_length=250, null=True) 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): def as_html(self):
"""Return a <link> tag forthis favicon image.""" """Return a <link> tag forthis favicon image."""
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment