From c714ff4dbeaab4c15a6340e270627ac490a850e4 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Thu, 11 Jun 2020 11:42:38 +0200
Subject: [PATCH] name function cleanup

---
 cookbook/templates/meal_plan.html | 37 +++++++++++++------------------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/cookbook/templates/meal_plan.html b/cookbook/templates/meal_plan.html
index 89483e5f7..7738fc50d 100644
--- a/cookbook/templates/meal_plan.html
+++ b/cookbook/templates/meal_plan.html
@@ -68,34 +68,20 @@
 
                                         <div class="col-">
 
-                                            <i class="fas fa-arrows-alt handle input-group-text" style="width: 100%"></i>
+                                            <i class="fas fa-arrows-alt handle input-group-text"
+                                               style="width: 100%"></i>
                                         </div>
                                         <div class="list-group-item">
 
-                                            <a href="#" v-if="element.title !== ''"
-                                               @click="plan_detail = element" data-toggle="modal"
-                                               data-target="#exampleModal">[[element.title]]</a>
-                                            <a href="#" v-else-if="element.recipe_name !== ''"
-                                               @click="plan_detail = element"
-                                               data-toggle="modal"
-                                               data-target="#exampleModal">[[element.recipe_name]]</a>
-                                            <a href="#" v-else-if="element.name !== ''"
-                                               @click="plan_detail = element" data-toggle="modal"
-                                               data-target="#exampleModal">[[element.name]]</a>
+                                            <a href="#" @click="plan_detail = element" data-toggle="modal"
+                                               data-target="#exampleModal">[[ planElementName(element)]]</a>
+
                                         </div>
                                     </div>
                                     <div class="list-group-item handle d-md-block d-none">
                                         <div class="col-md-12">
-                                            <a href="#" v-if="element.title !== ''"
-                                               @click="plan_detail = element" data-toggle="modal"
-                                               data-target="#exampleModal">[[element.title]]</a>
-                                            <a href="#" v-else-if="element.recipe_name !== ''"
-                                               @click="plan_detail = element"
-                                               data-toggle="modal"
-                                               data-target="#exampleModal">[[element.recipe_name]]</a>
-                                            <a href="#" v-else-if="element.name !== ''"
-                                               @click="plan_detail = element" data-toggle="modal"
-                                               data-target="#exampleModal">[[element.name]]</a>
+                                            <a href="#" @click="plan_detail = element" data-toggle="modal"
+                                               data-target="#exampleModal">[[ planElementName(element)]]</a>
                                         </div>
                                     </div>
                                 </div>
@@ -410,6 +396,15 @@
                     this.new_note_text = ''
                     return new_entry
                 },
+                planElementName: function (element) {
+                    if (element.title) {
+                        return element.title
+                    } else if (element.recipe_name) {
+                        return element.recipe_name
+                    } else {
+                        return element.name
+                    }
+                },
                 planDetailRecipeUrl: function () {
                     return "{% url 'view_recipe' 12345 %}".replace(/12345/, this.plan_detail.recipe);
                 },