Update dependencies (cherry-picked from ar)

As far as i can see, the only breaking change is the change from
@detail_route to @action(detail=True) decorator in
rest_framework.decorators.
(famous last words)
nix-and-poetry
Stan Drozd 2021-02-28 00:36:50 +01:00
parent 5aa9f56d3e
commit 140eeb43da
No known key found for this signature in database
GPG Key ID: E96EA51A5D7F84E7
2 changed files with 18 additions and 18 deletions

View File

@ -1,16 +1,16 @@
certifi==2017.4.17
chardet==3.0.3
Django==1.11.15
certifi==2019.11.28
chardet==3.0.4
Django==1.11.28
git+https://github.com/djangonauts/django-hstore@61427e474cb2f4be8fdfce225d78a5330bc77eb0#egg=django-hstore
git+https://github.com/d42/django-tree@687c01c02d91cada9ca1912e34e482da9e73e27a#egg=django-tree
django-appconf==1.0.2
django-appconf==1.0.3
django-flat-responsive==2.0
social-auth-app-django==2.1.0
social-auth-app-django==3.1.0
Django-Select2==6.3.1
djangorestframework==3.5.4
Pillow==3.3.1
psycopg2==2.7.5
djangorestframework==3.11.0
Pillow==6.2.1
psycopg2==2.8.4
djangorestframework-hstore==1.3
requests==2.16.5
urllib3==1.21.1
django_markdown2==0.3.0
requests==2.22.0
urllib3==1.25.8
django_markdown2==0.3.1

View File

@ -1,6 +1,6 @@
from rest_framework import viewsets, generics, filters
from rest_framework.response import Response
from rest_framework.decorators import detail_route
from rest_framework.decorators import action
from rest_framework.permissions import AllowAny
from storage.models import Item, Label
@ -31,7 +31,7 @@ class LabelViewSet(viewsets.ModelViewSet):
queryset = Label.objects
serializer_class = LabelSerializer
@detail_route(methods=['post'], permission_classes=[AllowAny])
@action(detail=True,methods=['post'], permission_classes=[AllowAny])
def print(self, request, pk):
quantity = min(int(request.query_params.get('quantity', 1)), 5)
obj = self.get_object()
@ -72,7 +72,7 @@ class ItemViewSet(viewsets.ModelViewSet):
except Label.DoesNotExist:
raise Http404()
@detail_route(methods=['post'], permission_classes=[AllowAny])
@action(detail=True)
def print(self, request, pk):
# todo: deduplicate
quantity = min(int(request.query_params.get('quantity', 1)), 5)
@ -81,22 +81,22 @@ class ItemViewSet(viewsets.ModelViewSet):
obj.print()
return obj
@detail_route()
@action(detail=True)
def children(self, request, pk):
item = self.get_object()
return Response(self.serializer_class(item.get_children().all(), many=True).data)
@detail_route()
@action(detail=True)
def ancestors(self, request, pk):
item = self.get_object()
return Response(self.serializer_class(item.get_ancestors().all(), many=True).data)
@detail_route()
@action(detail=True)
def descendants(self, request, pk):
item = self.get_object()
return Response(self.serializer_class(item.get_descendants().all(), many=True).data)
@detail_route()
@action(detail=True)
def siblings(self, request, pk):
item = self.get_object()
return Response(self.serializer_class(item.get_siblings().all(), many=True).data)