cgiacofei/TandoorRecipes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

edit + tables

Browse Source
This commit is contained in:
Unknown 2018-02-01 15:34:43 +01:00
parent 4d3e8e6b53
commit e9dc2dc48f
8 changed files with 154 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

200
.idea/workspace.xml
View File

@ -2,16 +2,12 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="f314243c-cf5d-48a7-b986-5e05ee924c9f" name="Default" comment="">
<change beforePath="" afterPath="$PROJECT_DIR$/cookbook/migrations/0002_auto_20180201_1457.py" />
<change beforePath="$PROJECT_DIR$/.idea/Recipies.iml" afterPath="$PROJECT_DIR$/.idea/Recipies.iml" />
<change beforePath="$PROJECT_DIR$/.idea/jsLibraryMappings.xml" afterPath="$PROJECT_DIR$/.idea/jsLibraryMappings.xml" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change beforePath="$PROJECT_DIR$/cookbook/forms.py" afterPath="$PROJECT_DIR$/cookbook/forms.py" />
<change beforePath="$PROJECT_DIR$/cookbook/models.py" afterPath="$PROJECT_DIR$/cookbook/models.py" />
<change beforePath="$PROJECT_DIR$/cookbook/tables.py" afterPath="$PROJECT_DIR$/cookbook/tables.py" />
<change beforePath="$PROJECT_DIR$/cookbook/templates/base.html" afterPath="$PROJECT_DIR$/cookbook/templates/base.html" />
<change beforePath="$PROJECT_DIR$/cookbook/templates/index.html" afterPath="$PROJECT_DIR$/cookbook/templates/index.html" />
<change beforePath="$PROJECT_DIR$/cookbook/templates/new_category.html" afterPath="$PROJECT_DIR$/cookbook/templates/new_category.html" />
<change beforePath="$PROJECT_DIR$/cookbook/templates/new_keyword.html" afterPath="$PROJECT_DIR$/cookbook/templates/new_keyword.html" />
<change beforePath="$PROJECT_DIR$/cookbook/urls.py" afterPath="$PROJECT_DIR$/cookbook/urls.py" />
<change beforePath="$PROJECT_DIR$/cookbook/views.py" afterPath="$PROJECT_DIR$/cookbook/views.py" />
<change beforePath="$PROJECT_DIR$/db.sqlite3" afterPath="$PROJECT_DIR$/db.sqlite3" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@ -57,64 +53,20 @@
<file leaf-file-name="views.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/cookbook/views.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="49" />
<state relative-caret-position="203">
<caret line="39" column="13" lean-forward="false" selection-start-line="39" selection-start-column="13" selection-end-line="39" selection-end-column="13" />
<folding>
<element signature="e#0#49#0" expanded="true" />
<element signature="e#0#57#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/cookbook/templates/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="58">
<caret line="2" column="0" lean-forward="false" selection-start-line="2" selection-start-column="0" selection-end-line="3" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="forms.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/cookbook/forms.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="232">
<caret line="41" column="32" lean-forward="true" selection-start-line="41" selection-start-column="32" selection-end-line="41" selection-end-column="32" />
<folding>
<element signature="e#0#42#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="models.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/cookbook/models.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="145">
<caret line="5" column="57" lean-forward="false" selection-start-line="5" selection-start-column="57" selection-end-line="5" selection-end-column="57" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="filters.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/cookbook/filters.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="261">
<caret line="9" column="22" lean-forward="false" selection-start-line="9" selection-start-column="22" selection-end-line="9" selection-end-column="22" />
<folding>
<element signature="e#0#21#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="tables.py" pinned="false" current-in-tab="false">
<file leaf-file-name="tables.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/cookbook/tables.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="261">
<caret line="9" column="49" lean-forward="false" selection-start-line="9" selection-start-column="49" selection-end-line="9" selection-end-column="49" />
<state relative-caret-position="754">
<caret line="26" column="4" lean-forward="false" selection-start-line="26" selection-start-column="4" selection-end-line="26" selection-end-column="4" />
<folding>
<element signature="e#0#31#0" expanded="true" />
</folding>
@ -139,6 +91,7 @@
<find>'django.template.context_processors.request'</find>
<find>of</find>
<find>trans</find>
<find>new_keywor</find>
</findStrings>
</component>
<component name="Git.Settings">
@ -151,23 +104,23 @@
<option value="$PROJECT_DIR$/cookbook/templates/registration.html" />
<option value="$PROJECT_DIR$/cookbook/templates/registration/new_keyword.html" />
<option value="$PROJECT_DIR$/cookbook/templates/new_recipe.html" />
<option value="$PROJECT_DIR$/cookbook/urls.py" />
<option value="$PROJECT_DIR$/cookbook/templates/tables/table_template.html" />
<option value="$PROJECT_DIR$/cookbook/locale/de/LC_MESSAGES/django.po" />
<option value="$PROJECT_DIR$/Recipies/urls.py" />
<option value="$PROJECT_DIR$/cookbook/templates/registration/login.html" />
<option value="$PROJECT_DIR$/cookbook/tables.py" />
<option value="$PROJECT_DIR$/cookbook/views.py" />
<option value="$PROJECT_DIR$/cookbook/filters.py" />
<option value="$PROJECT_DIR$/Recipies/settings.py" />
<option value="$PROJECT_DIR$/.gitignore" />
<option value="$PROJECT_DIR$/requirements.txt" />
<option value="$PROJECT_DIR$/cookbook/templates/index.html" />
<option value="$PROJECT_DIR$/cookbook/templates/new_category.html" />
<option value="$PROJECT_DIR$/cookbook/models.py" />
<option value="$PROJECT_DIR$/cookbook/forms.py" />
<option value="$PROJECT_DIR$/cookbook/templates/new_keyword.html" />
<option value="$PROJECT_DIR$/cookbook/templates/base.html" />
<option value="$PROJECT_DIR$/cookbook/templates/new_category.html" />
<option value="$PROJECT_DIR$/cookbook/templates/new_keyword.html" />
<option value="$PROJECT_DIR$/cookbook/views.py" />
<option value="$PROJECT_DIR$/cookbook/urls.py" />
<option value="$PROJECT_DIR$/cookbook/tables.py" />
</list>
</option>
</component>
@ -257,7 +210,7 @@
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="DefaultHtmlFileTemplate" value="HTML File" />
<property name="com.intellij.database.dataSource.DataSourceTemplate" value="Sqlite (Xerial)" />
<property name="SearchEverywhereHistoryKey" value="base&#9;FILE&#9;file://C:/Users/bene/Documents/Developement/Django/recipies/cookbook/templates/base.html&#10;new_&#9;FILE&#9;file://C:/Users/bene/Documents/Developement/Django/recipies/cookbook/templates/new_keyword.html&#10;models&#9;FILE&#9;file://C:/Users/bene/Documents/Developement/Django/recipies/cookbook/models.py&#10;view&#9;FILE&#9;file://C:/Users/bene/Documents/Developement/Django/recipies/cookbook/views.py&#10;sett&#9;FILE&#9;file://C:/Users/bene/Documents/Developement/Django/recipies/Recipies/settings.py&#10;setting&#9;FILE&#9;file://F:/Developement/Django/Recipies/Recipies/settings.py&#10;model&#9;FILE&#9;file://F:/Developement/Django/Recipies/cookbook/models.py&#10;settings&#9;FILE&#9;file://F:/Developement/Django/Recipies/Recipies/settings.py&#10;forms&#9;FILE&#9;file://F:/Developement/Django/Recipies/cookbook/forms.py&#10;mode&#9;FILE&#9;file://F:/Developement/Django/Recipies/cookbook/models.py&#10;settin&#9;FILE&#9;file://F:/Developement/Django/Recipies/Recipies/settings.py" />
<property name="SearchEverywhereHistoryKey" value="new_&#9;FILE&#9;file://C:/Users/bene/Documents/Developement/Django/recipies/cookbook/templates/new_keyword.html&#10;tabl&#9;FILE&#9;file://C:/Users/bene/Documents/Developement/Django/recipies/cookbook/tables.py&#10;tablees&#9;null&#9;null&#10;base&#9;FILE&#9;file://C:/Users/bene/Documents/Developement/Django/recipies/cookbook/templates/base.html&#10;models&#9;FILE&#9;file://C:/Users/bene/Documents/Developement/Django/recipies/cookbook/models.py&#10;view&#9;FILE&#9;file://C:/Users/bene/Documents/Developement/Django/recipies/cookbook/views.py&#10;sett&#9;FILE&#9;file://C:/Users/bene/Documents/Developement/Django/recipies/Recipies/settings.py&#10;setting&#9;FILE&#9;file://F:/Developement/Django/Recipies/Recipies/settings.py&#10;model&#9;FILE&#9;file://F:/Developement/Django/Recipies/cookbook/models.py&#10;settings&#9;FILE&#9;file://F:/Developement/Django/Recipies/Recipies/settings.py&#10;forms&#9;FILE&#9;file://F:/Developement/Django/Recipies/cookbook/forms.py&#10;mode&#9;FILE&#9;file://F:/Developement/Django/Recipies/cookbook/models.py&#10;settin&#9;FILE&#9;file://F:/Developement/Django/Recipies/Recipies/settings.py" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/venv" />
</component>
<component name="RecentsManager">
@ -324,10 +277,10 @@
<layout>
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
<window_info id="manage.py@Recipies" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32915568" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="manage.py@Recipies" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32915568" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32915568" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.2585752" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2585752" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32915568" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2094811" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
<window_info id="Docker" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
@ -353,6 +306,13 @@
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<default-breakpoints>
<breakpoint type="python-exception">
<properties notifyOnTerminate="true" exception="BaseException">
<option name="notifyOnTerminate" value="true" />
</properties>
</breakpoint>
</default-breakpoints>
<option name="time" value="6" />
</breakpoint-manager>
<watches-manager />
@ -402,9 +362,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
<caret line="8" column="41" lean-forward="false" selection-start-line="8" selection-start-column="41" selection-end-line="8" selection-end-column="41" />
<folding>
<element signature="e#0#28#0" expanded="false" />
</folding>
<folding />
</state>
</provider>
</entry>
@ -469,7 +427,7 @@
<state relative-caret-position="0">
<caret line="0" column="49" lean-forward="false" selection-start-line="0" selection-start-column="49" selection-end-line="0" selection-end-column="49" />
<folding>
<element signature="e#0#49#0" expanded="true" />
<element signature="e#0#57#0" expanded="true" />
</folding>
</state>
</provider>
@ -536,16 +494,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/cookbook/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="10" column="0" lean-forward="true" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
<folding>
<element signature="e#0#28#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="das://table:/76de5693/b165bb40-b588-4413-81a1-07015656a7cb/main.cookbook_recipe" />
<entry file="file://$PROJECT_DIR$/manage.py">
<provider selected="true" editor-type-id="text-editor">
@ -592,16 +540,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/cookbook/tables.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="261">
<caret line="9" column="49" lean-forward="false" selection-start-line="9" selection-start-column="49" selection-end-line="9" selection-end-column="49" />
<folding>
<element signature="e#0#31#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/cookbook/filters.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="261">
@ -626,24 +564,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/cookbook/views.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="49" />
<folding>
<element signature="e#0#49#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/cookbook/templates/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="58">
<caret line="2" column="0" lean-forward="false" selection-start-line="2" selection-start-column="0" selection-end-line="3" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/cookbook/models.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="145">
@ -654,37 +574,75 @@
</entry>
<entry file="file://$PROJECT_DIR$/cookbook/templates/new_category.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="464">
<caret line="16" column="0" lean-forward="false" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/cookbook/templates/base.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="377">
<caret line="22" column="79" lean-forward="false" selection-start-line="22" selection-start-column="79" selection-end-line="22" selection-end-column="79" />
<state relative-caret-position="522">
<caret line="18" column="4" lean-forward="true" selection-start-line="18" selection-start-column="4" selection-end-line="20" selection-end-column="15" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/cookbook/templates/new_keyword.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="203">
<caret line="7" column="0" lean-forward="true" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" />
<state relative-caret-position="522">
<caret line="18" column="18" lean-forward="true" selection-start-line="18" selection-start-column="18" selection-end-line="18" selection-end-column="18" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/cookbook/templates/base.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="348">
<caret line="43" column="0" lean-forward="true" selection-start-line="43" selection-start-column="0" selection-end-line="43" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/cookbook/forms.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="232">
<caret line="41" column="32" lean-forward="true" selection-start-line="41" selection-start-column="32" selection-end-line="41" selection-end-column="32" />
<state relative-caret-position="734">
<caret line="69" column="18" lean-forward="true" selection-start-line="69" selection-start-column="18" selection-end-line="69" selection-end-column="18" />
<folding>
<element signature="e#0#42#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/cookbook/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="319">
<caret line="11" column="48" lean-forward="false" selection-start-line="11" selection-start-column="48" selection-end-line="11" selection-end-column="48" />
<folding>
<element signature="e#0#28#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/cookbook/templates/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="29">
<caret line="1" column="0" lean-forward="false" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="25" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/cookbook/views.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="203">
<caret line="39" column="13" lean-forward="false" selection-start-line="39" selection-start-column="13" selection-end-line="39" selection-end-column="13" />
<folding>
<element signature="e#0#57#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/cookbook/tables.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="754">
<caret line="26" column="4" lean-forward="false" selection-start-line="26" selection-start-column="4" selection-end-line="26" selection-end-column="4" />
<folding>
<element signature="e#0#31#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component>
</project>

23
cookbook/tables.py
View File

@ -1,10 +1,31 @@
import django_tables2 as tables
from django_tables2.utils import A # alias for Accessor
from .models import *
class RecipeTable(tables.Table):
id = tables.LinkColumn('edit_recipe', args=[A('id')])
class Meta:
model = Recipe
template_name = 'tables/table_template.html'
fields = ('name', 'category', 'all_tags')
fields = ('id', 'name', 'category', 'all_tags')
class CategoryTable(tables.Table):
id = tables.LinkColumn('edit_recipe', args=[A('id')])
class Meta:
model = Category
template_name = 'tables/table_template.html'
fields = ('id', 'name')
class KeywordTable(tables.Table):
id = tables.LinkColumn('edit_recipe', args=[A('id')])
class Meta:
model = Keyword
template_name = 'tables/table_template.html'
fields = ('id', 'name')

24
cookbook/templates/base.html
View File

@ -28,7 +28,8 @@
<div class="collapse navbar-collapse" id="navbarText">
<ul class="navbar-nav mr-auto">
<li class="nav-item active">
<a class="nav-link" href="{% url 'index' %}">{% trans 'Cookbook' %}<span class="sr-only">(current)</span></a>
<a class="nav-link" href="{% url 'index' %}">{% trans 'Cookbook' %}<span
class="sr-only">(current)</span></a>
</li>
<li class="nav-item">
<a class="nav-link" href="{% url 'new_recipe' %}">{% trans 'New Recipe' %}</a>
@ -40,13 +41,20 @@
<a class="nav-link" href="{% url 'new_keyword' %}">{% trans 'New Keyword' %}</a>
</li>
</ul>
<span class="navbar-text">
{% if user.is_authenticated %}
<a href="{% url 'logout' %}">Logout {{ user.get_username }}</a>
{% else %}
<a href="{% url 'login' %}">Login</a>
{% endif %}
</span>
<ul class="navbar-nav ml-auto">
<li class="nav-item">
<a class="nav-link" href="{% url 'admin:index' %}">{% trans 'Admin' %}</a>
</li>
<li class="nav-item">
{% if user.is_authenticated %}
<a class="nav-link" href="{% url 'logout' %}">{% trans 'Logout' %} {{ user.get_username }}</a>
{% else %}
<a class="nav-link" href="{% url 'login' %}">{% trans 'Login' %}</a>
{% endif %}
</li>
</ul>
</div>
</nav>
<br/>

4
cookbook/templates/new_category.html
View File

@ -1,6 +1,7 @@
{% extends "base.html" %}
{% load crispy_forms_tags %}
{% load i18n %}
{% load django_tables2 %}
{% block title %}{% trans 'New Category' %}{% endblock %}
@ -15,4 +16,7 @@
{% crispy form %}
</form>
{% if table %}
{% render_table table %}
{% endif %}
{% endblock %}

4
cookbook/templates/new_keyword.html
View File

@ -1,6 +1,7 @@
{% extends "base.html" %}
{% load crispy_forms_tags %}
{% load i18n %}
{% load django_tables2 %}
{% block title %}{% trans 'New Keyword' %}{% endblock %}
@ -15,4 +16,7 @@
{% crispy form %}
</form>
{% if table %}
{% render_table table %}
{% endif %}
{% endblock %}

3
cookbook/urls.py
View File

@ -7,4 +7,7 @@ urlpatterns = [
path('new_recipe', views.new_recipe, name='new_recipe'),
path('new_category', views.new_category, name='new_category'),
path('new_keyword', views.new_keyword, name='new_keyword'),
path('edit_recipe/<int:id>/', views.edit_recipe, name='edit_recipe'),
path('edit_category/<int:id>/', views.edit_category, name='edit_category'),
path('edit_keyword/<int:id>/', views.new_keyword, name='edit_keyword'),
]

32
cookbook/views.py
View File

@ -1,11 +1,10 @@
from django.utils.translation import gettext as _
from django.contrib.auth.decorators import login_required
from django.shortcuts import render, redirect
from django_tables2 import RequestConfig
from cookbook.filters import RecipeFilter
from cookbook.forms import *
from cookbook.tables import RecipeTable
from cookbook.tables import RecipeTable, CategoryTable, KeywordTable
def index(request):
@ -20,6 +19,21 @@ def index(request):
return render(request, 'index.html')
@login_required
def edit_recipe(request, id):
return render(request, 'index.html')
@login_required
def edit_category(request, id):
return render(request, 'index.html')
@login_required
def edit_keyword(request, id):
return render(request, 'index.html')
@login_required
def new_recipe(request):
if request.method == "POST":
@ -44,11 +58,14 @@ def new_category(request):
category = form.save(commit=False)
category.created_by = request.user.id
category.save()
return redirect('index')
return redirect('new_category')
else:
form = CategoryForm()
return render(request, 'new_category.html', {'form': form})
table = CategoryTable(Category.objects.all())
RequestConfig(request, paginate={'per_page': 25}).configure(table)
return render(request, 'new_category.html', {'form': form, 'table': table})
@login_required
@ -59,8 +76,11 @@ def new_keyword(request):
keyword = form.save(commit=False)
keyword.created_by = request.user.id
keyword.save()
return redirect('index')
return redirect('new_keyword')
else:
form = KeywordForm()
return render(request, 'new_keyword.html', {'form': form})
table = KeywordTable(Keyword.objects.all())
RequestConfig(request, paginate={'per_page': 25}).configure(table)
return render(request, 'new_keyword.html', {'form': form, 'table': table})

BIN
db.sqlite3
View File

Binary file not shown.