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

Merge pull request #1574 from smilerz/export_from_filter

Browse Source 
fix serializer using food name instead of supermarket name
This commit is contained in:
vabene1111
2022-02-24 07:50:18 +01:00
committed by GitHub
parent 05305c46ca c8dcca8630
commit bedbc255b3
4 changed files with 33 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cookbook/forms.py
View File

@@ -179,7 +179,7 @@ class ImportForm(ImportExportBase):
class ExportForm(ImportExportBase):
recipes = forms.ModelMultipleChoiceField(widget=MultiSelectWidget, queryset=Recipe.objects.none(), required=False)
all = forms.BooleanField(required=False)
filter = forms.IntegerField(required=False)
custom_filter = forms.IntegerField(required=False)
def __init__(self, *args, **kwargs):
space = kwargs.pop('space')

2
cookbook/serializer.py
View File

@@ -424,7 +424,7 @@ class FoodSerializer(UniqueFieldsMixin, WritableNestedModelSerializer, ExtendedR
sm_category = validated_data['supermarket_category']
sc_name = sm_category.pop('name', None)
validated_data['supermarket_category'], sc_created = SupermarketCategory.objects.get_or_create(
name=name,
name=sc_name,
space=space, defaults=sm_category)
onhand = validated_data.pop('food_onhand', None)

4
cookbook/views/import_export.py
View File

@@ -124,8 +124,8 @@ def export_recipe(request):
recipes = form.cleaned_data['recipes']
if form.cleaned_data['all']:
recipes = Recipe.objects.filter(space=request.space, internal=True).all()
elif filter := form.cleaned_data['filter']:
search = RecipeSearch(request, filter=filter)
elif custom_filter := form.cleaned_data['custom_filter']:
search = RecipeSearch(request, filter=custom_filter)
recipes = search.get_queryset(Recipe.objects.filter(space=request.space, internal=True))
integration = get_integration(request, form.cleaned_data['type'])