From 7e39e6fea5bdfd0f6511cab02672a742783bcc73 Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Mon, 5 Feb 2024 13:52:52 +0100 Subject: [PATCH] fixed meal type constraint --- cookbook/admin.py | 4 ++-- cookbook/serializer.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cookbook/admin.py b/cookbook/admin.py index 823246283..fc148afe5 100644 --- a/cookbook/admin.py +++ b/cookbook/admin.py @@ -315,8 +315,8 @@ admin.site.register(MealPlan, MealPlanAdmin) class MealTypeAdmin(admin.ModelAdmin): - list_display = ('name', 'created_by', 'order') - search_fields = ('name', 'created_by__username') + list_display = ('name', 'space', 'created_by', 'order') + search_fields = ('name', 'space', 'created_by__username') admin.site.register(MealType, MealTypeAdmin) diff --git a/cookbook/serializer.py b/cookbook/serializer.py index 09e571032..df8aff885 100644 --- a/cookbook/serializer.py +++ b/cookbook/serializer.py @@ -348,7 +348,7 @@ class MealTypeSerializer(SpacedModelSerializer, WritableNestedModelSerializer): validated_data['name'] = validated_data['name'].strip() space = validated_data.pop('space', self.context['request'].space) validated_data['created_by'] = self.context['request'].user - obj, created = MealType.objects.get_or_create(name__iexact=validated_data['name'], space=space, defaults=validated_data) + obj, created = MealType.objects.get_or_create(name__iexact=validated_data['name'], space=space, created_by=self.context['request'].user, defaults=validated_data) return obj class Meta: