diff --git a/djangoshaker/views.py b/djangoshaker/views.py --- a/djangoshaker/views.py +++ b/djangoshaker/views.py @@ -49,17 +49,18 @@ class UserView(TemplateView): def get_context_data(self, **kwargs): context = super(UserView, self).get_context_data(**kwargs) - context['user_ingredients'] = Ingredient.objects.filter(pk__in = self.request.session['user_ingredients']).order_by('name') - context['ingredients'] = Ingredient.objects.exclude(pk__in = self.request.session['user_ingredients']).order_by('name') + if 'user_ingredients' in self.request.session: + context['user_ingredients'] = Ingredient.objects.filter(pk__in = self.request.session['user_ingredients']).order_by('name') + context['ingredients'] = Ingredient.objects.exclude(pk__in = self.request.session['user_ingredients']).order_by('name') - user_ingredients = set(self.request.session['user_ingredients']) - available_recipes = [] - for recipe in Recipe.objects.all(): - recipe_ingredients = set([recing.ingredient_id for recing in recipe.recipeingredient_set.all()]) - if recipe_ingredients.issubset(user_ingredients): - print recipe.name - available_recipes.append(recipe) - context['available_recipes'] = available_recipes + user_ingredients = set(self.request.session['user_ingredients']) + available_recipes = [] + for recipe in Recipe.objects.all(): + recipe_ingredients = set([recing.ingredient_id for recing in recipe.recipeingredient_set.all()]) + if recipe_ingredients.issubset(user_ingredients): + print recipe.name + available_recipes.append(recipe) + context['available_recipes'] = available_recipes return context