WIP

cookbook/views/delete.py

@@ -9,7 +9,7 @@ from django.views.generic import DeleteView
 from cookbook.helper.permission_helper import (GroupRequiredMixin,
                                                OwnerRequiredMixin,
                                                group_required)
-from cookbook.models import (Comment, InviteLink, Keyword, MealPlan, Recipe,
+from cookbook.models import (Comment, InviteLink, MealPlan, Recipe,
                              RecipeBook, RecipeBookEntry, RecipeImport,
                              Storage, Sync)
 from cookbook.provider.dropbox import Dropbox
@@ -73,16 +73,16 @@ class SyncDelete(GroupRequiredMixin, DeleteView):
         return context
 
 
-class KeywordDelete(GroupRequiredMixin, DeleteView):
-    groups_required = ['user']
-    template_name = "generic/delete_template.html"
-    model = Keyword
-    success_url = reverse_lazy('list_keyword')
+# class KeywordDelete(GroupRequiredMixin, DeleteView):
+#     groups_required = ['user']
+#     template_name = "generic/delete_template.html"
+#     model = Keyword
+#     success_url = reverse_lazy('list_keyword')
 
-    def get_context_data(self, **kwargs):
-        context = super(KeywordDelete, self).get_context_data(**kwargs)
-        context['title'] = _("Keyword")
-        return context
+#     def get_context_data(self, **kwargs):
+#         context = super(KeywordDelete, self).get_context_data(**kwargs)
+#         context['title'] = _("Keyword")
+#         return context
 
 
 class StorageDelete(GroupRequiredMixin, DeleteView):

cookbook/views/edit.py

@@ -10,14 +10,14 @@ from django.views.generic import UpdateView
 from django.views.generic.edit import FormMixin
 from django_scopes import scopes_disabled
 
-from cookbook.forms import (CommentForm, ExternalRecipeForm, FoodForm,
-                            FoodMergeForm, KeywordForm, MealPlanForm,
+from cookbook.forms import (CommentForm, ExternalRecipeForm,
+                            FoodMergeForm, MealPlanForm,
                             RecipeBookForm, StorageForm, SyncForm,
                             UnitMergeForm)
 from cookbook.helper.permission_helper import (GroupRequiredMixin,
                                                OwnerRequiredMixin,
                                                group_required)
-from cookbook.models import (Comment, Food, Ingredient, Keyword, MealPlan,
+from cookbook.models import (Comment, Ingredient, MealPlan,
                              MealType, Recipe, RecipeBook, RecipeImport,
                              Storage, Sync, UserPreference)
 from cookbook.provider.dropbox import Dropbox
@@ -86,38 +86,38 @@ class SyncUpdate(GroupRequiredMixin, UpdateView, SpaceFormMixing):
         return context
 
 
-class KeywordUpdate(GroupRequiredMixin, UpdateView):
-    groups_required = ['user']
-    template_name = "generic/edit_template.html"
-    model = Keyword
-    form_class = KeywordForm
+# class KeywordUpdate(GroupRequiredMixin, UpdateView):
+#     groups_required = ['user']
+#     template_name = "generic/edit_template.html"
+#     model = Keyword
+#     form_class = KeywordForm
 
-    # TODO add msg box
+#     # TODO add msg box
 
-    def get_success_url(self):
-        return reverse('list_keyword')
+#     def get_success_url(self):
+#         return reverse('list_keyword')
 
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        context['title'] = _("Keyword")
-        return context
+#     def get_context_data(self, **kwargs):
+#         context = super().get_context_data(**kwargs)
+#         context['title'] = _("Keyword")
+#         return context
 
 
-class FoodUpdate(GroupRequiredMixin, UpdateView, SpaceFormMixing):
-    groups_required = ['user']
-    template_name = "generic/edit_template.html"
-    model = Food
-    form_class = FoodForm
+# class FoodUpdate(GroupRequiredMixin, UpdateView, SpaceFormMixing):
+#     groups_required = ['user']
+#     template_name = "generic/edit_template.html"
+#     model = Food
+#     form_class = FoodForm
 
-    # TODO add msg box
+#     # TODO add msg box
 
-    def get_success_url(self):
-        return reverse('edit_food', kwargs={'pk': self.object.pk})
+#     def get_success_url(self):
+#         return reverse('edit_food', kwargs={'pk': self.object.pk})
 
-    def get_context_data(self, **kwargs):
-        context = super(FoodUpdate, self).get_context_data(**kwargs)
-        context['title'] = _("Food")
-        return context
+#     def get_context_data(self, **kwargs):
+#         context = super(FoodUpdate, self).get_context_data(**kwargs)
+#         context['title'] = _("Food")
+#         return context
 
 
 @group_required('admin')
@@ -279,6 +279,7 @@ class ExternalRecipeUpdate(GroupRequiredMixin, UpdateView, SpaceFormMixing):
         return context
 
 
+# TODO deprecate
 @group_required('user')
 def edit_ingredients(request):
     if request.method == "POST":

cookbook/views/lists.py

@@ -5,11 +5,11 @@ from django.shortcuts import render
 from django.utils.translation import gettext as _
 from django_tables2 import RequestConfig
 
-from cookbook.filters import FoodFilter, ShoppingListFilter
+from cookbook.filters import ShoppingListFilter
 from cookbook.helper.permission_helper import group_required
-from cookbook.models import (Food, InviteLink, RecipeImport,
+from cookbook.models import (InviteLink, RecipeImport,
                              ShoppingList, Storage, SyncLog)
-from cookbook.tables import (ImportLogTable, IngredientTable, InviteLinkTable,
+from cookbook.tables import (ImportLogTable, InviteLinkTable,
                              RecipeImportTable, ShoppingListTable, StorageTable)
 
 
@@ -40,18 +40,18 @@ def recipe_import(request):
     )
 
 
-@group_required('user')
-def food(request):
-    f = FoodFilter(request.GET, queryset=Food.objects.filter(space=request.space).all().order_by('pk'))
+# @group_required('user')
+# def food(request):
+#     f = FoodFilter(request.GET, queryset=Food.objects.filter(space=request.space).all().order_by('pk'))
 
-    table = IngredientTable(f.qs)
-    RequestConfig(request, paginate={'per_page': 25}).configure(table)
+#     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}
-    )
+#     return render(
+#         request,
+#         'generic/list_template.html',
+#         {'title': _("Ingredients"), 'table': table, 'filter': f}
+#     )
 
 
 @group_required('user')
@@ -101,3 +101,13 @@ def invite_link(request):
         'table': table,
         'create_url': 'new_invite_link'
     })
+
+
+@group_required('user')
+def keyword(request):
+    return render(request, 'model/keyword_template.html', {"title": _("Keywords")})
+
+
+@group_required('user')
+def food(request):
+    return render(request, 'generic/model_template.html', {"title": _("Foods")})

cookbook/views/new.py

@@ -12,11 +12,11 @@ from django.urls import reverse, reverse_lazy
 from django.utils.translation import gettext as _
 from django.views.generic import CreateView
 
-from cookbook.forms import (ImportRecipeForm, InviteLinkForm, KeywordForm,
+from cookbook.forms import (ImportRecipeForm, InviteLinkForm,
                             MealPlanForm, RecipeBookForm, Storage, StorageForm)
 from cookbook.helper.permission_helper import (GroupRequiredMixin,
                                                group_required)
-from cookbook.models import (InviteLink, Keyword, MealPlan, MealType, Recipe,
+from cookbook.models import (InviteLink, MealPlan, MealType, Recipe,
                              RecipeBook, RecipeImport, ShareLink, Step, UserPreference)
 from cookbook.views.edit import SpaceFormMixing
 
@@ -60,22 +60,22 @@ def share_link(request, pk):
     return HttpResponseRedirect(reverse('view_recipe', kwargs={'pk': pk, 'share': link.uuid}))
 
 
-class KeywordCreate(GroupRequiredMixin, CreateView):
-    groups_required = ['user']
-    template_name = "generic/new_template.html"
-    model = Keyword
-    form_class = KeywordForm
-    success_url = reverse_lazy('list_keyword')
+# class KeywordCreate(GroupRequiredMixin, CreateView):
+#     groups_required = ['user']
+#     template_name = "generic/new_template.html"
+#     model = Keyword
+#     form_class = KeywordForm
+#     success_url = reverse_lazy('list_keyword')
 
-    def form_valid(self, form):
-        form.cleaned_data['space'] = self.request.space
-        form.save()
-        return HttpResponseRedirect(reverse('list_keyword'))
+#     def form_valid(self, form):
+#         form.cleaned_data['space'] = self.request.space
+#         form.save()
+#         return HttpResponseRedirect(reverse('list_keyword'))
 
-    def get_context_data(self, **kwargs):
-        context = super(KeywordCreate, self).get_context_data(**kwargs)
-        context['title'] = _("Keyword")
-        return context
+#     def get_context_data(self, **kwargs):
+#         context = super(KeywordCreate, self).get_context_data(**kwargs)
+#         context['title'] = _("Keyword")
+#         return context
 
 
 class StorageCreate(GroupRequiredMixin, CreateView):

cookbook/views/trees.py

@@ -1,13 +0,0 @@
-from django.shortcuts import render
-
-from cookbook.helper.permission_helper import group_required
-
-
-@group_required('user')
-def keyword(request):
-    return render(request, 'model/keyword_template.html', {})
-
-
-@group_required('user')
-def food(request):
-    return render(request, 'model/food_template.html', {})