diff --git a/backend/api/management/commands/worker.py b/backend/api/management/commands/worker.py index 8491c00..1b9cc03 100644 --- a/backend/api/management/commands/worker.py +++ b/backend/api/management/commands/worker.py @@ -4,6 +4,7 @@ from datetime import datetime, timedelta from django.core.management.base import BaseCommand from django.core.management import call_command from django.utils import timezone +from django.db import models from api.models import Job from io import StringIO @@ -70,5 +71,3 @@ class Command(BaseCommand): job.error_message = error job.save() self.stdout.write(self.style.SUCCESS(f"Job finished: {job.status}")) - -from django.db import models # Needed for the Q object inside handle diff --git a/backend/api/views.py b/backend/api/views.py index c5491e6..67743c0 100644 --- a/backend/api/views.py +++ b/backend/api/views.py @@ -8,12 +8,12 @@ from django_filters.rest_framework import DjangoFilterBackend from django_ratelimit.decorators import ratelimit from django.utils.decorators import method_decorator from rest_framework.pagination import PageNumberPagination -from .models import User, Flavor, Category, Rating, Reply, Notification, Ticket, TicketMessage, UserIP, ProfileComment, Banner +from .models import User, Flavor, Category, Rating, Reply, Notification, Ticket, TicketMessage, UserIP, ProfileComment, Banner, SystemConfig, Job from .serializers import ( UserSerializer, FlavorSerializer, CategorySerializer, RatingSerializer, ReplySerializer, NotificationSerializer, TicketSerializer, TicketMessageSerializer, AdminUserListSerializer, AdminUserDetailSerializer, - ProfileCommentSerializer, BannerSerializer + ProfileCommentSerializer, BannerSerializer, SystemConfigSerializer, JobSerializer ) def log_user_ip(user, request): @@ -870,8 +870,8 @@ class AdminViewSet(viewsets.ViewSet): 'debug': settings.DEBUG, 'allowed_hosts': settings.ALLOWED_HOSTS, 'frontend_url': getattr(settings, 'FRONTEND_URL', 'Not set'), - 'media_root': settings.MEDIA_ROOT, - 'static_root': settings.STATIC_ROOT, + 'media_root': str(settings.MEDIA_ROOT), + 'static_root': str(settings.STATIC_ROOT), } })