added ability to link recipes to ingredients

cookbook/views/delete.py

@@ -4,7 +4,7 @@ from django.utils.translation import gettext as _
 from django.views.generic import DeleteView
 
 from cookbook.models import Recipe, Sync, Keyword, RecipeImport, Storage, Comment, RecipeBook, \
-    RecipeBookEntry, MealPlan
+    RecipeBookEntry, MealPlan, Ingredient
 from cookbook.provider.dropbox import Dropbox
 from cookbook.provider.nextcloud import Nextcloud
 
@@ -73,6 +73,17 @@ class KeywordDelete(LoginRequiredMixin, DeleteView):
         return context
 
 
+class IngredientDelete(LoginRequiredMixin, DeleteView):
+    template_name = "generic/delete_template.html"
+    model = Ingredient
+    success_url = reverse_lazy('list_ingredient')
+
+    def get_context_data(self, **kwargs):
+        context = super(IngredientDelete, self).get_context_data(**kwargs)
+        context['title'] = _("Ingredient")
+        return context
+
+
 class StorageDelete(LoginRequiredMixin, DeleteView):
     template_name = "generic/delete_template.html"
     model = Storage

cookbook/views/edit.py

@@ -15,7 +15,7 @@ from django.utils.translation import gettext as _
 from django.views.generic import UpdateView
 
 from cookbook.forms import ExternalRecipeForm, KeywordForm, StorageForm, SyncForm, InternalRecipeForm, CommentForm, \
-    MealPlanForm, UnitMergeForm, IngredientMergeForm
+    MealPlanForm, UnitMergeForm, IngredientMergeForm, IngredientForm
 from cookbook.models import Recipe, Sync, Keyword, RecipeImport, Storage, Comment, RecipeIngredient, RecipeBook, \
     MealPlan, Unit, Ingredient
 from cookbook.provider.dropbox import Dropbox
@@ -157,6 +157,22 @@ class KeywordUpdate(LoginRequiredMixin, UpdateView):
         return context
 
 
+class IngredientUpdate(LoginRequiredMixin, UpdateView):
+    template_name = "generic/edit_template.html"
+    model = Ingredient
+    form_class = IngredientForm
+
+    # TODO add msg box
+
+    def get_success_url(self):
+        return reverse('edit_ingredient', kwargs={'pk': self.object.pk})
+
+    def get_context_data(self, **kwargs):
+        context = super(IngredientUpdate, self).get_context_data(**kwargs)
+        context['title'] = _("Ingredient")
+        return context
+
+
 @login_required
 def edit_storage(request, pk):
     instance = get_object_or_404(Storage, pk=pk)

cookbook/views/lists.py

@@ -5,8 +5,9 @@ from django.urls import reverse_lazy
 from django_tables2 import RequestConfig
 from django.utils.translation import gettext as _
 
-from cookbook.models import Keyword, SyncLog, RecipeImport, Storage
-from cookbook.tables import KeywordTable, ImportLogTable, RecipeImportTable, StorageTable
+from cookbook.filters import IngredientFilter
+from cookbook.models import Keyword, SyncLog, RecipeImport, Storage, Ingredient
+from cookbook.tables import KeywordTable, ImportLogTable, RecipeImportTable, StorageTable, IngredientTable
 
 
 @login_required
@@ -34,6 +35,16 @@ def recipe_import(request):
     return render(request, 'generic/list_template.html', {'title': _("Import"), 'table': table, 'import_btn': True})
 
 
+@login_required
+def ingredient(request):
+    f = IngredientFilter(request.GET, queryset=Ingredient.objects.all().order_by('pk'))
+
+    table = IngredientTable(f.qs)
+    RequestConfig(request, paginate={'per_page': 25}).configure(table)
+
+    return render(request, 'generic/list_template.html', {'title': _("Ingredients"), 'table': table, 'filter': f})
+
+
 @login_required
 def storage(request):
     table = StorageTable(Storage.objects.all())