From a4e2f142642bf97cca867e037f8042138ce3a236 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=95=D0=B2=D0=B3=D0=B5=D0=BD=D0=B8=D0=B9=20=D0=9C=D0=BE?=
 =?UTF-8?q?=D1=81=D0=BA=D0=B0=D0=BB=D1=8F=D0=BD=D0=BE=D0=B2?=
 <emos@inbox.ru>
Date: Mon, 4 Sep 2023 22:06:15 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20=D0=BD?=
 =?UTF-8?q?=D0=B0=D0=B4=20=D0=B0=D0=B4=D0=BC=D0=B8=D0=BD=D0=BA=D0=BE=D0=B9?=
 =?UTF-8?q?.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/recipes/admin.py | 21 +++++----------------
 backend/users/admin.py   |  4 +---
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/backend/recipes/admin.py b/backend/recipes/admin.py
index cbae150..5203702 100644
--- a/backend/recipes/admin.py
+++ b/backend/recipes/admin.py
@@ -1,28 +1,22 @@
 """Содержит настройки административной панели для приложения recipes."""
 from django import forms
 from django.contrib import admin
-from django.core.exceptions import ValidationError
 
 from .models import Tag, Ingredient, Recipe, IngredientOccurence
 
 
 class IngredientOccurenceAdminFormSet(forms.BaseInlineFormSet):
-    # validate_min = True
-    def clean(self):
-        if any(self.errors):
-            return
-
-        if all(self._should_delete_form(form) for form in self.forms):
-            raise ValidationError('Нельзя удалить все ингредиенты.')
+    default_error_messages = dict(
+        too_few_forms='Рецепт должен содержать хотя бы один ингредиент.'
+    )
 
 
 class IngredientOccurenceInline(admin.TabularInline):
     """Настройки отображения модели IngredientOccurence в административной
     панели.
     """
-    # formset = IngredientOccurenceAdminFormSet
+    formset = IngredientOccurenceAdminFormSet
     model = IngredientOccurence
-    # validate_min = True
     extra = 0
     min_num = 1
     verbose_name = 'Ингредиент в этом рецепте'
@@ -35,12 +29,7 @@ def measurement_unit(self, occurence):
         return occurence.ingredient.measurement_unit
 
     def get_formset(self, request, obj=None, **kwargs):
-        kwargs.update(
-            validate_min=True,
-            error_messages=dict(
-                too_few_forms='Рецепт должен содержать хотя бы один ингредиент.'
-            )
-        )
+        kwargs.update(validate_min=True)
         return super().get_formset(request, obj, **kwargs)
 
 
diff --git a/backend/users/admin.py b/backend/users/admin.py
index c41959b..fa6239c 100644
--- a/backend/users/admin.py
+++ b/backend/users/admin.py
@@ -8,12 +8,10 @@
 
 class UserAdminForm(forms.ModelForm):
     def clean_subscribed_to(self):
-        # print(f'\nINSTANCE: {self.instance.pk}\n')
-        # print(f'\nC_DATA: {self.cleaned_data}\n')
         value = self.cleaned_data['subscribed_to']
         if value.filter(pk=self.instance.pk).exists():
             raise ValidationError('Нельзя подписаться на самого себя.')
-            
+
         return value