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

Merge remote-tracking branch 'origin/master' into 560-add-avatar-field-to-person-and-group

parents 9151320e 70b78f85
No related branches found
No related tags found
1 merge request!809Resolve "Add avatar field to Person and Group"
......@@ -25,6 +25,7 @@ Added
Fixed
~~~~~
* Changing the favicon did not result in all icons being replaced in some cases
* GroupManager.get_queryset() returned an incomplete QuerySet
* OAuth was broken by a non-semver-adhering django-oauth-toolkit update
* Too long texts in chips didn't result in a larger chip.
......
......@@ -97,15 +97,16 @@ class CoreConfig(AppConfig):
if name in ("primary", "secondary"):
clean_scss()
elif name in ("favicon", "pwa_icon"):
from favicon.models import Favicon # noqa
from favicon.models import Favicon, FaviconImg # noqa
is_favicon = name == "favicon"
if new_value:
Favicon.on_site.update_or_create(
favicon_id = Favicon.on_site.update_or_create(
title=name,
defaults={"isFavicon": is_favicon, "faviconImage": new_value},
)
)[0]
FaviconImg.objects.filter(faviconFK=favicon_id).delete()
else:
Favicon.on_site.filter(title=name, isFavicon=is_favicon).delete()
if name in settings.DEFAULT_FAVICON_PATHS:
......
......@@ -6,7 +6,7 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('core', '0030_user_attributes'),
('core', '0031_oauthapplication_icon'),
]
operations = [
......
......@@ -98,7 +98,7 @@ django-dbbackup = "^3.3.0"
spdx-license-list = "^0.5.0"
license-expression = "^21.6"
django-reversion = "^4.0.0"
django-favicon-plus-reloaded = "^1.1.2"
django-favicon-plus-reloaded = "^1.1.5"
django-health-check = "^3.12.1"
psutil = "^5.7.0"
celery-progress = "^0.1.0"
......
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