cgiacofei/TandoorRecipes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/shopping-ui

Browse Source 
# Conflicts:
#	cookbook/serializer.py
This commit is contained in:
vabene1111
2024-02-05 15:59:56 +01:00
parent 4eafbddfdb b6cbb28a87
commit 1a5881bb4b
11 changed files with 106 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cookbook/serializer.py
View File

@ -353,8 +353,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: