mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-03 13:19:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/vue3

Browse Source
This commit is contained in:
vabene1111
2024-05-01 13:45:37 +02:00
parent c11dd8bcae 4b551c595a
commit 17693b90b5
6 changed files with 64 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cookbook/serializer.py
View File

@@ -393,7 +393,7 @@ class MealTypeSerializer(SpacedModelSerializer, WritableNestedModelSerializer):
class Meta:
list_serializer_class = SpaceFilterSerializer
model = MealType
fields = ('id', 'name', 'order', 'color', 'default', 'created_by')
fields = ('id', 'name', 'order', 'time', 'color', 'default', 'created_by')
read_only_fields = ('created_by',)
@@ -1099,7 +1099,7 @@ class MealPlanSerializer(SpacedModelSerializer, WritableNestedModelSerializer):
shared = UserSerializer(many=True, required=False, allow_null=True)
shopping = serializers.SerializerMethodField('in_shopping')
to_date = serializers.DateField(required=False)
to_date = serializers.DateTimeField(required=False)
@extend_schema_field(str)
def get_note_markdown(self, obj):