Compare commits
No commits in common. "a20b3211daa655bef0d1807d999c3b4aa0e9a64f" and "5c83230185ae8f1220fce2df4990ef028222a99a" have entirely different histories.
a20b3211da
...
5c83230185
2 changed files with 2 additions and 19 deletions
|
@ -42,7 +42,6 @@ class MovieListListSerializer(serializers.ModelSerializer):
|
||||||
class MovieListSerializer(serializers.ModelSerializer):
|
class MovieListSerializer(serializers.ModelSerializer):
|
||||||
movies = MovieSerializer(read_only=True, many=True)
|
movies = MovieSerializer(read_only=True, many=True)
|
||||||
serializer_class = MovieSerializer
|
serializer_class = MovieSerializer
|
||||||
owner = serializers.PrimaryKeyRelatedField(read_only=True)
|
|
||||||
|
|
||||||
def get_queryset(self):
|
def get_queryset(self):
|
||||||
return MovieList.objects.prefetch_related(
|
return MovieList.objects.prefetch_related(
|
||||||
|
|
|
@ -1,10 +1,9 @@
|
||||||
import datetime
|
import datetime
|
||||||
|
import json
|
||||||
|
|
||||||
from django.db.models import QuerySet
|
|
||||||
from django.http import JsonResponse
|
from django.http import JsonResponse
|
||||||
from django.contrib.auth.models import User
|
from django.contrib.auth.models import User
|
||||||
from django.utils.dateparse import parse_datetime
|
from django.utils.dateparse import parse_datetime
|
||||||
from django.db import models
|
|
||||||
from rest_framework import permissions, viewsets
|
from rest_framework import permissions, viewsets
|
||||||
from knox.auth import TokenAuthentication
|
from knox.auth import TokenAuthentication
|
||||||
from rest_framework.decorators import action, api_view
|
from rest_framework.decorators import action, api_view
|
||||||
|
@ -67,29 +66,14 @@ class MovieListViewset(viewsets.ModelViewSet):
|
||||||
return MovieListSerializer
|
return MovieListSerializer
|
||||||
|
|
||||||
def get_queryset(self):
|
def get_queryset(self):
|
||||||
base_qs = MovieList.objects.all()
|
|
||||||
|
|
||||||
if self.action == "list":
|
if self.action == "list":
|
||||||
if self.request.user.is_authenticated:
|
return MovieList.objects.filter(owner=self.request.user)
|
||||||
return base_qs.filter(
|
|
||||||
models.Q(public=True) |
|
|
||||||
models.Q(owner=self.request.user)
|
|
||||||
).order_by("name")
|
|
||||||
|
|
||||||
return base_qs.filter(public=True).order_by("name")
|
|
||||||
else:
|
else:
|
||||||
return MovieList.objects.prefetch_related(
|
return MovieList.objects.prefetch_related(
|
||||||
"movies",
|
"movies",
|
||||||
"movies__showing_set"
|
"movies__showing_set"
|
||||||
).order_by("name")
|
).order_by("name")
|
||||||
|
|
||||||
def perform_create(self, serializer):
|
|
||||||
serializer.save(owner=self.request.user)
|
|
||||||
|
|
||||||
def get_permissions(self):
|
|
||||||
if self.action in ['update', 'partial_update', 'destroy']:
|
|
||||||
self.permission_classes = [permissions.IsAuthenticated]
|
|
||||||
return super().get_permissions()
|
|
||||||
|
|
||||||
def create(self, request, *args, **kwargs):
|
def create(self, request, *args, **kwargs):
|
||||||
movie_list = MovieList.objects.create(
|
movie_list = MovieList.objects.create(
|
||||||
|
|
Loading…
Add table
Reference in a new issue