Merge pull request #4 from ZebraHr/develop

правки после ревью
ZebraHr · Sep 28, 2023 · 6458fc4 · 6458fc4
2 parents ecc46a1 + d565aa3
commit 6458fc4
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 7 deletions.
diff --git a/backend/api/filters.py b/backend/api/filters.py
@@ -1,4 +1,5 @@
 from django_filters.rest_framework import filters, FilterSet
+
 from recipes.models import Recipe, Ingredient
 from users.models import User
 

diff --git a/backend/api/permissions.py b/backend/api/permissions.py
@@ -13,8 +13,3 @@ def has_permission(self, request, view):
                 or (
                     request.user.is_authenticated
                     and (request.user.is_admin or request.user.is_superuser)))
-
-# class IsAdminOrReadOnly(BasePermission):
-#     def has_permission(self, request, view):
-#         return (request.method in SAFE_METHODS
-#                 or request.user and request.user.is_staff)
diff --git a/backend/api/serializers.py b/backend/api/serializers.py
@@ -121,7 +121,6 @@ class RecipeCreateSerializer(serializers.ModelSerializer):
         many=True
     )
     cooking_time = serializers.IntegerField(
-        read_only=True,
         min_value=settings.MIN_VALUE,
         max_value=settings.MAX_VALUE)
 

diff --git a/backend/api/views.py b/backend/api/views.py
@@ -198,7 +198,7 @@ def download_shopping_cart(self, request):
                 amount=Sum('amount'))
         shopping_list = ([f'{i["ingredient__name"]}'
                           f' - {i["amount"]}'
-                          f' ({i["ingredient__measurement_unit"]}'
+                          f' {i["ingredient__measurement_unit"]}'
                           for i in ingredients])
         text = canvas.Canvas(buffer)
         font = ttfonts.TTFont('Arial', './docs/arialfont.ttf')