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

Merge branch 'master' into 'fix/oauth-toolkit-migration'

# Conflicts:
#   CHANGELOG.rst
parents 91358222 2385a348
No related branches found
No related tags found
1 merge request!1266Create migration for newer version of django-oauth-toolkit
Pipeline #133736 failed
......@@ -13,6 +13,7 @@ Fixed
~~~~~
* Progress page didn't work properly.
* About page failed to load for apps with an unknown licence.
* Support newer versions of django-oauth-toolkit.
`3.1`_ - 2022-05-30
......
......@@ -87,6 +87,10 @@ class AppConfig(django.apps.AppConfig):
# Get string representation of licence in SPDX format
licence = getattr(cls, "licence", None)
default_flags = {
"isFsfLibre": False,
"isOsiApproved": False,
}
default_dict = {
"isDeprecatedLicenseId": False,
"isFsfLibre": False,
......@@ -131,7 +135,7 @@ class AppConfig(django.apps.AppConfig):
return (readable, flags, licence_dicts)
else:
# We could not find a valid licence
return ("Unknown", [default_dict])
return ("Unknown", default_flags, [default_dict])
@classmethod
def get_licence_dict(cls):
......
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