fix filter_to_supermarket setting
This commit is contained in:
parent
b4510a2cc1
commit
24bef756e8
@ -481,7 +481,7 @@ class ShoppingPreferenceForm(forms.ModelForm):
|
|||||||
|
|
||||||
fields = (
|
fields = (
|
||||||
'shopping_share', 'shopping_auto_sync', 'mealplan_autoadd_shopping', 'mealplan_autoexclude_onhand',
|
'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 = {
|
help_texts = {
|
||||||
|
@ -180,10 +180,9 @@ class UserPreferenceSerializer(serializers.ModelSerializer):
|
|||||||
class Meta:
|
class Meta:
|
||||||
model = UserPreference
|
model = UserPreference
|
||||||
fields = (
|
fields = (
|
||||||
'user', 'theme', 'nav_color', 'default_unit', 'default_page', 'use_kj',
|
'user', 'theme', 'nav_color', 'default_unit', 'default_page', 'use_kj', 'search_style', 'show_recent', 'plan_share',
|
||||||
'search_style', 'show_recent', 'plan_share', 'ingredient_decimals',
|
'ingredient_decimals', 'comments', 'shopping_auto_sync', 'mealplan_autoadd_shopping', 'food_ignore_default', 'default_delay',
|
||||||
'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'
|
||||||
'mealplan_autoinclude_related', 'mealplan_autoexclude_onhand', 'shopping_share', 'shopping_recent_days', 'csv_delim', 'csv_prefix'
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@ -75,7 +75,6 @@
|
|||||||
></generic-multiselect>
|
></generic-multiselect>
|
||||||
<small tabindex="-1" class="form-text text-muted">{{ $t("Share") }}</small>
|
<small tabindex="-1" class="form-text text-muted">{{ $t("Share") }}</small>
|
||||||
</b-form-group>
|
</b-form-group>
|
||||||
<!-- TODO: hide this checkbox if autoadding menuplans, but allow editing on-hand -->
|
|
||||||
<b-input-group v-if="!autoMealPlan">
|
<b-input-group v-if="!autoMealPlan">
|
||||||
<b-form-checkbox id="AddToShopping" v-model="entryEditing.addshopping" />
|
<b-form-checkbox id="AddToShopping" v-model="entryEditing.addshopping" />
|
||||||
<small tabindex="-1" class="form-text text-muted">{{ $t("AddToShopping") }}</small>
|
<small tabindex="-1" class="form-text text-muted">{{ $t("AddToShopping") }}</small>
|
||||||
|
Loading…
Reference in New Issue
Block a user