From 24bef756e899009d87effa57cd515a0044182dbb Mon Sep 17 00:00:00 2001
From: smilerz <smilerz@gmail.com>
Date: Tue, 21 Dec 2021 13:53:16 -0600
Subject: [PATCH] fix filter_to_supermarket setting

---
 cookbook/forms.py                        | 2 +-
 cookbook/serializer.py                   | 7 +++----
 vue/src/components/MealPlanEditModal.vue | 1 -
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/cookbook/forms.py b/cookbook/forms.py
index 364641c7..e53c3e3e 100644
--- a/cookbook/forms.py
+++ b/cookbook/forms.py
@@ -481,7 +481,7 @@ class ShoppingPreferenceForm(forms.ModelForm):
 
         fields = (
             'shopping_share', 'shopping_auto_sync', 'mealplan_autoadd_shopping', 'mealplan_autoexclude_onhand',
-            'mealplan_autoinclude_related', 'default_delay', 'filter_to_supermarket', 'shopping_recent_days', 'csv_delim'
+            'mealplan_autoinclude_related', 'default_delay', 'filter_to_supermarket', 'shopping_recent_days', 'csv_delim', 'csv_prefix'
         )
 
         help_texts = {
diff --git a/cookbook/serializer.py b/cookbook/serializer.py
index 53ab324f..4fe1b814 100644
--- a/cookbook/serializer.py
+++ b/cookbook/serializer.py
@@ -180,10 +180,9 @@ class UserPreferenceSerializer(serializers.ModelSerializer):
     class Meta:
         model = UserPreference
         fields = (
-            'user', 'theme', 'nav_color', 'default_unit', 'default_page', 'use_kj',
-            'search_style', 'show_recent', 'plan_share', 'ingredient_decimals',
-            'comments', 'shopping_auto_sync', 'mealplan_autoadd_shopping', 'food_ignore_default', 'default_delay',
-            'mealplan_autoinclude_related', 'mealplan_autoexclude_onhand', 'shopping_share', 'shopping_recent_days', 'csv_delim', 'csv_prefix'
+            'user', 'theme', 'nav_color', 'default_unit', 'default_page', 'use_kj', 'search_style', 'show_recent', 'plan_share',
+            'ingredient_decimals', 'comments', 'shopping_auto_sync', 'mealplan_autoadd_shopping', 'food_ignore_default', 'default_delay',
+            'mealplan_autoinclude_related', 'mealplan_autoexclude_onhand', 'shopping_share', 'shopping_recent_days', 'csv_delim', 'csv_prefix', 'filter_to_supermarket'
         )
 
 
diff --git a/vue/src/components/MealPlanEditModal.vue b/vue/src/components/MealPlanEditModal.vue
index 02353c4e..f74c74ef 100644
--- a/vue/src/components/MealPlanEditModal.vue
+++ b/vue/src/components/MealPlanEditModal.vue
@@ -75,7 +75,6 @@
                                     ></generic-multiselect>
                                     <small tabindex="-1" class="form-text text-muted">{{ $t("Share") }}</small>
                                 </b-form-group>
-                                <!-- TODO: hide this checkbox if autoadding menuplans, but allow editing on-hand -->
                                 <b-input-group v-if="!autoMealPlan">
                                     <b-form-checkbox id="AddToShopping" v-model="entryEditing.addshopping" />
                                     <small tabindex="-1" class="form-text text-muted">{{ $t("AddToShopping") }}</small>