Skip to content
Snippets Groups Projects
Verified Commit e60d620e authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Make save method use get_favicons

Also, ensure that the default favicon is in config early
parent 952d0508
No related branches found
No related tags found
1 merge request!1Resolve "Optimise query count"
......@@ -23,6 +23,8 @@ config = {
}
config = getattr(settings, 'FAVICON_CONFIG', config)
if "shortcut icon" not in config or 32 not in config["shortcut icon"]:
config.setdefault("shortcut_icon", []).append(32)
image_path = getattr(settings, "FAVICON_PATH", "favicon")
......@@ -113,19 +115,12 @@ class Favicon(models.Model):
update = False
if self.isFavicon:
for n in Favicon.on_site.exclude(pk=self.pk):
n.isFavicon = False
n.save()
Favicon.on_site.exclude(pk=self.pk).update(isFavicon=False)
super(Favicon, self).save(*args, **kwargs)
if self.faviconImage:
for rel in config:
for size in config[rel]:
self.get_favicon(size=size, rel=rel, update=update)
# make sure default favicon is set
self.get_favicon(size=32, rel='shortcut icon')
self.get_favicons(update=update)
class FaviconImg(models.Model):
......
......@@ -23,8 +23,4 @@ def place_favicon(context):
for n in fav.get_favicons():
html += f'<link rel="{n.rel}" sizes="{n.size}x{n.size}" href="{n.faviconImage.url}"/>'
default_fav = fav.get_favicon(size=32, rel='shortcut icon')
html += f'<link rel="{default_fav.rel}" sizes="{default_fav.size}x{default_fav.size}"\
href="{default_fav.faviconImage.url}"/>'
return mark_safe(html)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment