diff --git a/cookbook/forms.py b/cookbook/forms.py index 0ac423a4..caa129b5 100644 --- a/cookbook/forms.py +++ b/cookbook/forms.py @@ -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') diff --git a/cookbook/views/import_export.py b/cookbook/views/import_export.py index 19e1a53b..58141687 100644 --- a/cookbook/views/import_export.py +++ b/cookbook/views/import_export.py @@ -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']) diff --git a/vue/src/apps/ExportView/ExportView.vue b/vue/src/apps/ExportView/ExportView.vue index 5a472ef9..0224850c 100644 --- a/vue/src/apps/ExportView/ExportView.vue +++ b/vue/src/apps/ExportView/ExportView.vue @@ -17,7 +17,7 @@ {{ $t("All recipes") }} - - + --> + this.searchRecipes("")) + // .then((e) => this.searchRecipes("")) }, - searchRecipes: function (query) { - let apiFactory = new ApiApiFactory() + // searchRecipes: function (query) { + // this.recipes_loading = true - this.recipes_loading = true - - let maxResultLenght = 1000 - apiFactory - .listRecipes(query, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, undefined, 1, maxResultLenght) - .then((response) => { - this.recipes = response.data.results - this.recipes_loading = false - }) - .catch((err) => { - console.log(err) - StandardToasts.makeStandardToast(StandardToasts.FAIL_FETCH) - }) - }, + // this.genericAPI(this.Models.RECIPE, this.Actions.LIST, { query: query }) + // .then((response) => { + // this.recipes = response.data.results + // this.recipes_loading = false + // }) + // .catch((err) => { + // console.log(err) + // StandardToasts.makeStandardToast(StandardToasts.FAIL_FETCH) + // }) + // }, exportRecipe: function () { if (this.recipe_list.length < 1 && this.export_all == false && this.filter === undefined) { @@ -142,7 +148,7 @@ export default { let formData = new FormData() formData.append("type", this.recipe_app) formData.append("all", this.export_all) - formData.append("filter", this.filter?.id) + formData.append("filter", this.filter?.id ?? null) for (var i = 0; i < this.recipe_list.length; i++) { formData.append("recipes", this.recipe_list[i].id)