From 37f7326f4c43c5d9cee0346058d18e7a6ac44fce Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Sat, 2 May 2020 14:58:23 +0200
Subject: [PATCH] minor mealplan cleanups

---
 cookbook/models.py                |  2 +-
 cookbook/templates/meal_plan.html | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/cookbook/models.py b/cookbook/models.py
index b127f96d..7384f686 100644
--- a/cookbook/models.py
+++ b/cookbook/models.py
@@ -227,7 +227,7 @@ class MealPlan(models.Model):
     note = models.TextField(blank=True)
     date = models.DateField()
 
-    def __str__(self):
+    def get_label(self):
         if self.title:
             return self.title
         return str(self.recipe)
diff --git a/cookbook/templates/meal_plan.html b/cookbook/templates/meal_plan.html
index b4f8f72c..f0ca3f14 100644
--- a/cookbook/templates/meal_plan.html
+++ b/cookbook/templates/meal_plan.html
@@ -9,19 +9,19 @@
 
 {% block content %}
     <style>
-        .mealplan-cell .mealplan-add-button{
+        .mealplan-cell .mealplan-add-button {
             text-align: center;
             display: block;
         }
 
         @media (hover: hover) {
-            .mealplan-cell .mealplan-add-button{
+            .mealplan-cell .mealplan-add-button {
                 visibility: hidden;
                 float: right;
                 display: inline;
             }
 
-            .mealplan-cell:hover .mealplan-add-button{
+            .mealplan-cell:hover .mealplan-add-button {
                 visibility: initial;
             }
         }
@@ -73,13 +73,17 @@
                     <tr>
                         {% for day_key, days_value in plan_value.days.items %}
                             <td class="mealplan-cell">
-                                <a class="mealplan-add-button" href="{% url 'new_meal_plan' %}?date={{ day_key|date:'Y-m-d' }}&meal={{ plan_key }}"><i class="fas fa-plus"></i></a>
+                                <a class="mealplan-add-button"
+                                   href="{% url 'new_meal_plan' %}?date={{ day_key|date:'Y-m-d' }}&meal={{ plan_key }}"><i
+                                        class="fas fa-plus"></i></a>
                                 {% for mp in days_value %}
-                                    <a href="{% url 'edit_meal_plan' mp.pk %}"><i class="fas fa-edit"></i></a>
                                     {% if mp.recipe %}
-                                        <a href="{% url 'view_recipe' mp.recipe.id %}">{{ mp }}</a><br/>
+                                        <a href="{% url 'edit_meal_plan' mp.pk %}"><i class="fas fa-edit"></i></a>
+                                        <a href="{% url 'view_recipe' mp.recipe.pk %}">{{ mp.recipe }}</a><br/>
+                                    {% else %}
+                                        <a href="{% url 'edit_meal_plan' mp.pk %}">{{ mp.title }}</a><br/>
                                     {% endif %}
-                                    <span>{{ mp.note_head }}</span>
+
                                 {% endfor %}
                             </td>
                         {% endfor %}