From 05dc3924c4feb197c4ce58b81d4d1160a860a5e5 Mon Sep 17 00:00:00 2001 From: vabene1111 Date: Thu, 3 May 2018 20:54:27 +0200 Subject: [PATCH] cleand up new views --- cookbook/forms.py | 41 ---------- cookbook/templates/base.html | 4 +- cookbook/templates/generic/new_template.html | 25 ++++++ cookbook/urls.py | 6 +- cookbook/views/new.py | 84 ++++++++------------ 5 files changed, 61 insertions(+), 99 deletions(-) create mode 100644 cookbook/templates/generic/new_template.html diff --git a/cookbook/forms.py b/cookbook/forms.py index 6f934318e..943a50990 100644 --- a/cookbook/forms.py +++ b/cookbook/forms.py @@ -4,9 +4,6 @@ from django.utils.translation import gettext as _ from django import forms from .models import * -# noinspection PyPackageRequirements -from dal import autocomplete - class RecipeForm(forms.ModelForm): class Meta: @@ -19,10 +16,6 @@ class RecipeForm(forms.ModelForm): 'keywords': _('Keywords'), } - help_texts = { - 'keywords': _('Ctrl+Click to select multiple keywords'), - } - def __init__(self, *args, **kwargs): super(RecipeForm, self).__init__(*args, **kwargs) self.helper = FormHelper() @@ -30,40 +23,6 @@ class RecipeForm(forms.ModelForm): self.helper.add_input(Submit('save', _('Save'), css_class='btn-primary')) -class CategoryForm(forms.ModelForm): - class Meta: - model = Category - fields = ('name', 'description') - - labels = { - 'name': _('Name'), - 'description': _('Description'), - } - - def __init__(self, *args, **kwargs): - super(CategoryForm, self).__init__(*args, **kwargs) - self.helper = FormHelper() - self.helper.form_method = 'post' - self.helper.add_input(Submit('save', _('Save'), css_class='btn-primary')) - - -class KeywordForm(forms.ModelForm): - class Meta: - model = Keyword - fields = ('name', 'description') - - labels = { - 'name': _('Name'), - 'description': _('Description'), - } - - def __init__(self, *args, **kwargs): - super(KeywordForm, self).__init__(*args, **kwargs) - self.helper = FormHelper() - self.helper.form_method = 'post' - self.helper.add_input(Submit('save', _('Save'), css_class='btn-primary')) - - class EditRecipeForm(forms.ModelForm): class Meta: model = Recipe diff --git a/cookbook/templates/base.html b/cookbook/templates/base.html index dc5b6bd6f..4d938f30d 100644 --- a/cookbook/templates/base.html +++ b/cookbook/templates/base.html @@ -53,8 +53,8 @@ {% trans 'New' %}
- {% trans 'Recipe' %} + {% trans 'Category' %} {% trans 'New' %} {{ title }} + +
+ {% csrf_token %} + {{ form|crispy }} + +
+ + + +{% endblock %} \ No newline at end of file diff --git a/cookbook/urls.py b/cookbook/urls.py index 905300ba3..87ddce92d 100644 --- a/cookbook/urls.py +++ b/cookbook/urls.py @@ -8,9 +8,9 @@ urlpatterns = [ path('', views.index, name='index'), path('test', views.test, name='test'), - path('new/recipe', new.recipe, name='new_recipe'), - path('new/category', new.category, name='new_category'), - path('new/keyword', new.keyword, name='new_keyword'), + path('new/recipe', new.RecipeCreate.as_view(), name='new_recipe'), + path('new/category', new.CategoryCreate.as_view(), name='new_category'), + path('new/keyword', new.KeywordCreate.as_view(), name='new_keyword'), path('list/keyword', lists.keyword_list, name='list_keyword'), path('list/category', lists.category_list, name='list_category'), diff --git a/cookbook/views/new.py b/cookbook/views/new.py index 7784a8427..45bb5f5dd 100644 --- a/cookbook/views/new.py +++ b/cookbook/views/new.py @@ -1,64 +1,42 @@ -from django.contrib import messages -from django.contrib.auth.decorators import login_required -from django.shortcuts import redirect, render -from django_tables2 import RequestConfig +from django.contrib.auth.mixins import LoginRequiredMixin +from django.urls import reverse_lazy from django.utils.translation import gettext as _ +from django.views.generic import CreateView -from cookbook.forms import CategoryForm, KeywordForm, RecipeForm -from cookbook.models import Category, Keyword -from cookbook.tables import CategoryTable, KeywordTable +from cookbook.models import Category, Keyword, Recipe -@login_required -def recipe(request): - if request.method == "POST": - form = RecipeForm(request.POST) - if form.is_valid(): - recipe_obj = form.save(commit=False) - recipe_obj.created_by = request.user.id - recipe_obj.save() - form.save_m2m() - messages.add_message(request, messages.SUCCESS, _('Recipe saved!')) - return redirect('index') - else: - form = RecipeForm() +class RecipeCreate(LoginRequiredMixin, CreateView): # this exists for completeness but is not in use at the moment + template_name = "generic\\new_template.html" + model = Recipe + fields = ['name', 'category', 'keywords'] + success_url = reverse_lazy('list_category') - return render(request, 'new/recipe.html', {'form': form}) + def get_context_data(self, **kwargs): + context = super(RecipeCreate, self).get_context_data(**kwargs) + context['title'] = _("Recipe") + return context -@login_required -def category(request): - if request.method == "POST": - form = CategoryForm(request.POST) - if form.is_valid(): - category_obj = form.save(commit=False) - category_obj.created_by = request.user.id - category_obj.save() - messages.add_message(request, messages.SUCCESS, _('Category saved!')) - return redirect('new_category') - else: - form = CategoryForm() +class CategoryCreate(LoginRequiredMixin, CreateView): + template_name = "generic\\new_template.html" + model = Category + fields = ['name', 'description'] + success_url = reverse_lazy('list_category') - table = CategoryTable(Category.objects.all()) - RequestConfig(request, paginate={'per_page': 25}).configure(table) - - return render(request, 'new/category.html', {'form': form, 'table': table}) + def get_context_data(self, **kwargs): + context = super(CategoryCreate, self).get_context_data(**kwargs) + context['title'] = _("Category") + return context -@login_required -def keyword(request): - if request.method == "POST": - form = KeywordForm(request.POST) - if form.is_valid(): - keyword_obj = form.save(commit=False) - keyword_obj.created_by = request.user.id - keyword_obj.save() - messages.add_message(request, messages.SUCCESS, _('Keyword saved!')) - return redirect('new_keyword') - else: - form = KeywordForm() +class KeywordCreate(LoginRequiredMixin, CreateView): + template_name = "generic\\new_template.html" + model = Keyword + fields = ['name', 'description'] + success_url = reverse_lazy('list_keyword') - table = KeywordTable(Keyword.objects.all()) - RequestConfig(request, paginate={'per_page': 25}).configure(table) - - return render(request, 'new/keyword.html', {'form': form, 'table': table}) + def get_context_data(self, **kwargs): + context = super(KeywordCreate, self).get_context_data(**kwargs) + context['title'] = _("Keyword") + return context