Mirrors/Dispatcharr
1
0
Fork 1
mirror of https://github.com/Dispatcharr/Dispatcharr.git synced 2026-01-23 02:35:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

More merge fixes.

Browse source
This commit is contained in:
SergeantPanda 2025-06-12 10:45:57 -05:00
parent ada1d51aaa
commit a99a6431b2
2 changed files with 5 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

13
core/api_views.py
View file

@ -4,13 +4,11 @@ import json
import ipaddress
import logging
from rest_framework import viewsets, status
from rest_framework.decorators import action
from rest_framework.response import Response
from django.shortcuts import get_object_or_404
<<<<<<< HEAD
from rest_framework.permissions import IsAuthenticated
from rest_framework.decorators import api_view, permission_classes
=======
from rest_framework.decorators import api_view, permission_classes, action
from drf_yasg.utils import swagger_auto_schema
from .models import (
UserAgent,
StreamProfile,
@ -25,9 +23,7 @@ from .serializers import (
CoreSettingsSerializer,
ProxySettingsSerializer,
)
from rest_framework.decorators import api_view, permission_classes, action
>>>>>>> 59e4a28b311d00d073f238e01e735d68a821c3f3
from drf_yasg.utils import swagger_auto_schema
import socket
import requests
import os
@ -116,7 +112,6 @@ class CoreSettingsViewSet(viewsets.ModelViewSet):
return Response({}, status=status.HTTP_200_OK)
<<<<<<< HEAD
class ProxySettingsViewSet(viewsets.ModelViewSet):
"""
API endpoint for proxy settings.
@ -173,10 +168,8 @@ class ProxySettingsViewSet(viewsets.ModelViewSet):
serializer.is_valid(raise_exception=True)
serializer.save()
return Response(serializer.data)
=======
>>>>>>> 59e4a28b311d00d073f238e01e735d68a821c3f3
@swagger_auto_schema(
method="get",

4
core/migrations/0013_proxysettings.py → core/migrations/0014_proxysettings.py
View file

@ -1,4 +1,4 @@
# Generated by Django 5.1.6 on 2025-06-11 02:22
# Generated by Django 5.1.6 on 2025-06-12 15:44
from django.db import migrations, models
@ -6,7 +6,7 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('core', '0012_default_active_m3u_accounts'),
('core', '0013_default_network_access_settings'),
]
operations = [