Skip to content

Commit

Permalink
adding menu items to the home page
Browse files Browse the repository at this point in the history
  • Loading branch information
RyanNoelk committed Aug 28, 2018
1 parent 6def2cf commit 7c56c0a
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 20 deletions.
21 changes: 6 additions & 15 deletions v1/menu/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# encoding: utf-8

from rest_framework import serializers
from rest_framework.fields import CharField

from v1.recipe.mixins import FieldLimiter
from v1.recipe.serializers import MiniBrowseSerializer
Expand All @@ -11,13 +10,10 @@

class MenuItemSerializer(FieldLimiter, serializers.ModelSerializer):
""" Standard `rest_framework` ModelSerializer """
# recipe = MiniBrowseSerializer(required=False)
recipe_title = CharField(source='recipe.title', read_only=True)
recipe_slug = CharField(source='recipe.slug', read_only=True)
recipe_pub_date = CharField(source='recipe.pub_date', read_only=True)
recipe_rating = CharField(source='recipe.rating', read_only=True)
recipe_photo_thumbnail = CharField(source='recipe.photo_thumbnail', read_only=True)
recipe_info = CharField(source='recipe.info', read_only=True)
recipe_data = MiniBrowseSerializer(read_only=True, source='recipe')
author = serializers.HiddenField(
default=serializers.CurrentUserDefault()
)

class Meta:
model = MenuItem
Expand All @@ -29,12 +25,7 @@ class Meta:
'all_day',
'start_date',
'end_date',

'recipe',
'recipe_title',
'recipe_slug',
'recipe_pub_date',
'recipe_rating',
'recipe_photo_thumbnail',
'recipe_info'
'recipe_data',
]
extra_kwargs = {'recipe': {'write_only': True}}
11 changes: 6 additions & 5 deletions v1/menu/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@ class MenuItemViewSet(viewsets.ModelViewSet):
queryset = MenuItem.objects.all()
serializer_class = MenuItemSerializer
permission_classes = (IsMenuItemOwner,)
filter_fields = ('recipe', 'start_date', 'end_date')
filter_fields = ('recipe', 'start_date', 'end_date', 'complete')

# def get_queryset(self):
# if self.request.user:
# return MenuItem.objects.filter(author=self.request.user)
# return MenuItem.objects.all()
def get_queryset(self):
user = self.request.user
if user and not user.is_anonymous:
return MenuItem.objects.filter(author=user)
return MenuItem.objects.none()

0 comments on commit 7c56c0a

Please sign in to comment.