Merge branch 'fix/pre-migration-errors' into 'master'

Fix pre-migration errors due to not available tables etc.

See merge request !613

aleksis/core/forms.py

@@ -377,8 +377,7 @@ class SchoolTermForm(ExtensibleForm):
 
 class DashboardWidgetOrderForm(ExtensibleForm):
     pk = forms.ModelChoiceField(
-        queryset=DashboardWidget.objects.all(),
-        widget=forms.HiddenInput(attrs={"class": "pk-input"}),
+        queryset=None, widget=forms.HiddenInput(attrs={"class": "pk-input"}),
     )
     order = forms.IntegerField(initial=0, widget=forms.HiddenInput(attrs={"class": "order-input"}))
 
@@ -386,6 +385,12 @@ class DashboardWidgetOrderForm(ExtensibleForm):
         model = DashboardWidget
         fields = []
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        # Set queryset here to prevent problems with not migrated database due to special queryset
+        self.fields["pk"].queryset = DashboardWidget.objects.all()
+
 
 DashboardWidgetOrderFormSet = forms.formset_factory(
     form=DashboardWidgetOrderForm, max_num=0, extra=0

aleksis/core/util/core_helpers.py

@@ -4,8 +4,10 @@ from importlib import import_module, metadata
 from itertools import groupby
 from operator import itemgetter
 from typing import Any, Callable, Optional, Sequence, Union
+from warnings import warn
 
 from django.conf import settings
+from django.core.exceptions import ImproperlyConfigured
 from django.core.files import File
 from django.db.models import Model, QuerySet
 from django.http import HttpRequest
@@ -130,6 +132,12 @@ def get_or_create_favicon(title: str, default: str, is_favicon: bool = False) ->
     """Ensure that there is always a favicon object."""
     from favicon.models import Favicon  # noqa
 
+    if not os.path.exists(default):
+        warn("staticfiles are not ready yet, not creating default icons")
+        return
+    elif os.path.isdir(default):
+        raise ImproperlyConfigured(f"staticfiles are broken: unexpected directory at {default}")
+
     favicon, created = Favicon.on_site.get_or_create(
         title=title, defaults={"isFavicon": is_favicon}
     )