diff --git a/vue/src/apps/MealPlanView/MealPlanView.vue b/vue/src/apps/MealPlanView/MealPlanView.vue
index 4e431ee2..99d70fbc 100644
--- a/vue/src/apps/MealPlanView/MealPlanView.vue
+++ b/vue/src/apps/MealPlanView/MealPlanView.vue
@@ -126,7 +126,7 @@
- {{ plan.entry.recipe.name }}
+ {{ plan.entry.recipe.name }}
{{ plan.entry.title }}
@@ -298,6 +298,7 @@ export default {
displayPeriodCount: 2,
startingDayOfWeek: 1,
displayWeekNumbers: true,
+ autoLoadServings: true,
},
dragged_item: null,
meal_types: [],
@@ -392,10 +393,19 @@ export default {
},
},
methods: {
+
+ getRecipeURL: function (recipe, servings) {
+ let slug
+ if (this.settings.autoLoadServings) {
+ slug = `${recipe.id}-${servings}`
+ } else {
+ slug = recipe.id
+ }
+ return this.resolveDjangoUrl("view_recipe",slug)
+ },
+
openRecipe: function (recipe, servings) {
- let ur = this.resolveDjangoUrl("view_recipe", `${recipe.id}-${servings}`)
- console.log(ur)
- window.open(ur)
+ window.open(this.getRecipeURL(recipe, servings))
},
setStartingDay(days) {
if (this.settings.startingDayOfWeek + days < 0) {
diff --git a/vue/src/components/Settings/MealPlanSettingsComponent.vue b/vue/src/components/Settings/MealPlanSettingsComponent.vue
index 34cad698..0ee53b7c 100644
--- a/vue/src/components/Settings/MealPlanSettingsComponent.vue
+++ b/vue/src/components/Settings/MealPlanSettingsComponent.vue
@@ -35,6 +35,11 @@
{{ $t("Show_Week_Numbers") }}
+
+
+ {{ $t("Auto_Link_servings") }}
+
+
diff --git a/vue/src/locales/en.json b/vue/src/locales/en.json
index e085bd92..6c375ff3 100644
--- a/vue/src/locales/en.json
+++ b/vue/src/locales/en.json
@@ -264,6 +264,8 @@
"Add_Servings_to_Shopping": "Add {servings} Servings to Shopping",
"Week_Numbers": "Week numbers",
"Show_Week_Numbers": "Show week numbers ?",
+ "Auto_Servings": "Servings Link",
+ "Auto_Link_servings": "Open Recipes with number of servings specified in plan ?",
"Export_As_ICal": "Export current period to iCal format",
"Export_To_ICal": "Export .ics",
"Cannot_Add_Notes_To_Shopping": "Notes cannot be added to the shopping list",
diff --git a/vue/src/stores/MealPlanStore.js b/vue/src/stores/MealPlanStore.js
index daac0cb9..bd72558d 100644
--- a/vue/src/stores/MealPlanStore.js
+++ b/vue/src/stores/MealPlanStore.js
@@ -108,6 +108,7 @@ export const useMealPlanStore = defineStore(_STORE_ID, {
displayPeriodCount: 3,
startingDayOfWeek: 1,
displayWeekNumbers: true,
+ autoLoadServings: true,
}
} else {
return JSON.parse(s)