Merge branch 'recipe_description' of github.com:smilerz/recipes into recipe_description

cookbook/views/api.py

@@ -71,6 +71,8 @@ class StandardFilterMixin(ViewSetMixin):
                 queryset = queryset.filter(updated_at__gte=updated_at)
             except FieldError:
                 pass
+            except ValidationError:
+                raise APIException(_('Parameter updated_at incorrectly formatted'))
 
         limit = self.request.query_params.get('limit', None)
         random = self.request.query_params.get('random', False)

cookbook/views/views.py

@@ -252,7 +252,7 @@ def shopping_list(request, pk=None):
         if re.match(r'^([0-9])+,([0-9])+[.]*([0-9])*$', r):
             rid, multiplier = r.split(',')
             if recipe := Recipe.objects.filter(pk=int(rid)).first():
-                recipes.append({'recipe': recipe.id, 'multiplier': multiplier})
+                recipes.append({'recipe': recipe.id, 'servings': multiplier})
 
     edit = True if 'edit' in request.GET and request.GET['edit'] == 'true' else False