diff --git a/cookbook/templates/base.html b/cookbook/templates/base.html index 4cc70acd..45cd09f5 100644 --- a/cookbook/templates/base.html +++ b/cookbook/templates/base.html @@ -30,7 +30,7 @@ return b ? b.pop() : ''; } - let theme_list = ['{% static 'themes/bootstrap.min.css' %}', '{% static 'themes/flatly.min.css' %}', '{% static 'themes/darkly.min.css' %}', '{% static 'themes/superhero.min.css' %}']; + let theme_list = ['{% static 'themes/bootstrap.min.css' %}', '{% static 'themes/flatly.min.css' %}', '{% static 'themes/superhero.min.css' %}']; let css = $('#id_main_css'); let theme = getCookieValue('theme'); diff --git a/cookbook/templates/generic/new_template.html b/cookbook/templates/generic/new_template.html index 7055179e..578e5dd3 100644 --- a/cookbook/templates/generic/new_template.html +++ b/cookbook/templates/generic/new_template.html @@ -23,4 +23,14 @@ + + + + {% endblock %} \ No newline at end of file diff --git a/cookbook/templates/settings.html b/cookbook/templates/settings.html index c4973a04..5d14bcd7 100644 --- a/cookbook/templates/settings.html +++ b/cookbook/templates/settings.html @@ -47,7 +47,7 @@ diff --git a/cookbook/views/new.py b/cookbook/views/new.py index 45923219..a6a798bd 100644 --- a/cookbook/views/new.py +++ b/cookbook/views/new.py @@ -1,3 +1,5 @@ +import re + from django.contrib import messages from django.contrib.auth.decorators import login_required from django.contrib.auth.mixins import LoginRequiredMixin @@ -126,4 +128,11 @@ class MealPlanCreate(LoginRequiredMixin, CreateView): def get_context_data(self, **kwargs): context = super(MealPlanCreate, self).get_context_data(**kwargs) context['title'] = _("Meal-Plan") + + recipe = self.request.GET.get('recipe') + if recipe: + if re.match(r'^([0-9])+$', recipe): + if Recipe.objects.filter(pk=int(recipe)).exists(): + context['default_recipe'] = Recipe.objects.get(pk=int(recipe)) + return context