cleanup
This commit is contained in:
vabene1111
parent
9bdc303f0e
commit
a183b53ae7
@ -2,13 +2,8 @@
|
||||
<project version="4">
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="f314243c-cf5d-48a7-b986-5e05ee924c9f" name="Default" comment="">
|
||||
<change beforePath="" afterPath="$PROJECT_DIR$/cookbook/tables.py" />
|
||||
<change beforePath="" afterPath="$PROJECT_DIR$/cookbook/templates/tables/table_template.html" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
|
||||
<change beforePath="$PROJECT_DIR$/Recipies/settings.py" afterPath="$PROJECT_DIR$/Recipies/settings.py" />
|
||||
<change beforePath="$PROJECT_DIR$/cookbook/models.py" afterPath="$PROJECT_DIR$/cookbook/models.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/views.py" afterPath="$PROJECT_DIR$/cookbook/views.py" />
|
||||
<change beforePath="$PROJECT_DIR$/db.sqlite3" afterPath="$PROJECT_DIR$/db.sqlite3" />
|
||||
</list>
|
||||
@ -52,45 +47,11 @@
|
||||
</component>
|
||||
<component name="FileEditorManager">
|
||||
<leaf>
|
||||
<file leaf-file-name="views.py" pinned="false" current-in-tab="false">
|
||||
<file leaf-file-name="views.py" pinned="false" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/cookbook/views.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="1125">
|
||||
<caret line="46" column="32" lean-forward="true" selection-start-line="46" selection-start-column="32" selection-end-line="46" selection-end-column="32" />
|
||||
<folding>
|
||||
<element signature="e#0#57#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="tables.py" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/cookbook/tables.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="225">
|
||||
<caret line="9" column="0" lean-forward="true" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="0" />
|
||||
<folding>
|
||||
<element signature="e#0#31#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="table_template.html" pinned="false" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/cookbook/templates/tables/table_template.html">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="406">
|
||||
<caret line="67" column="72" lean-forward="false" selection-start-line="67" selection-start-column="72" selection-end-line="67" selection-end-column="72" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
</file>
|
||||
<file leaf-file-name="settings.py" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/Recipies/settings.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="612">
|
||||
<caret line="36" column="34" lean-forward="true" selection-start-line="36" selection-start-column="34" selection-end-line="36" selection-end-column="34" />
|
||||
<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 />
|
||||
</state>
|
||||
</provider>
|
||||
@ -111,8 +72,8 @@
|
||||
<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="275">
|
||||
<caret line="11" column="0" lean-forward="true" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
|
||||
<state relative-caret-position="75">
|
||||
<caret line="3" column="0" lean-forward="false" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="38" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
@ -131,8 +92,8 @@
|
||||
<file leaf-file-name="new_category.html" pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/cookbook/templates/new_category.html">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="175">
|
||||
<caret line="7" column="9" lean-forward="false" selection-start-line="7" selection-start-column="9" selection-end-line="7" selection-end-column="9" />
|
||||
<state relative-caret-position="50">
|
||||
<caret line="2" column="31" lean-forward="false" selection-start-line="2" selection-start-column="31" selection-end-line="2" selection-end-column="31" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
@ -180,14 +141,14 @@
|
||||
<option value="$PROJECT_DIR$/cookbook/templates/new_recipe.html" />
|
||||
<option value="$PROJECT_DIR$/cookbook/urls.py" />
|
||||
<option value="$PROJECT_DIR$/cookbook/forms.py" />
|
||||
<option value="$PROJECT_DIR$/cookbook/templates/new_category.html" />
|
||||
<option value="$PROJECT_DIR$/Recipies/settings.py" />
|
||||
<option value="$PROJECT_DIR$/cookbook/templates/index.html" />
|
||||
<option value="$PROJECT_DIR$/cookbook/templates/base.html" />
|
||||
<option value="$PROJECT_DIR$/cookbook/tables.py" />
|
||||
<option value="$PROJECT_DIR$/cookbook/models.py" />
|
||||
<option value="$PROJECT_DIR$/cookbook/views.py" />
|
||||
<option value="$PROJECT_DIR$/cookbook/templates/tables/table_template.html" />
|
||||
<option value="$PROJECT_DIR$/cookbook/templates/index.html" />
|
||||
<option value="$PROJECT_DIR$/cookbook/templates/new_category.html" />
|
||||
<option value="$PROJECT_DIR$/cookbook/views.py" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
@ -459,14 +420,6 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/cookbook/templates/new_category.html">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="175">
|
||||
<caret line="7" column="9" lean-forward="false" selection-start-line="7" selection-start-column="9" selection-end-line="7" selection-end-column="9" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/cookbook/urls.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="200">
|
||||
@ -485,14 +438,6 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/Recipies/settings.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="612">
|
||||
<caret line="36" column="34" lean-forward="true" selection-start-line="36" selection-start-column="34" selection-end-line="36" selection-end-column="34" />
|
||||
<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="918">
|
||||
@ -501,14 +446,6 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/cookbook/templates/index.html">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="275">
|
||||
<caret line="11" column="0" lean-forward="true" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="das://table:/76de5693/85add68a-b15d-441c-9865-ed9a59ea29b9/main.cookbook_recipe">
|
||||
<provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
|
||||
<state>
|
||||
@ -538,6 +475,14 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/cookbook/templates/tables/table_template.html">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="1075">
|
||||
<caret line="67" column="72" lean-forward="false" selection-start-line="67" selection-start-column="72" selection-end-line="67" selection-end-column="72" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/cookbook/tables.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="225">
|
||||
@ -548,20 +493,34 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/cookbook/views.py">
|
||||
<entry file="file://$PROJECT_DIR$/Recipies/settings.py">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="1125">
|
||||
<caret line="46" column="32" lean-forward="true" selection-start-line="46" selection-start-column="32" selection-end-line="46" selection-end-column="32" />
|
||||
<folding>
|
||||
<element signature="e#0#57#0" expanded="true" />
|
||||
</folding>
|
||||
<state relative-caret-position="612">
|
||||
<caret line="36" column="34" lean-forward="true" selection-start-line="36" selection-start-column="34" selection-end-line="36" selection-end-column="34" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/cookbook/templates/tables/table_template.html">
|
||||
<entry file="file://$PROJECT_DIR$/cookbook/templates/index.html">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="406">
|
||||
<caret line="67" column="72" lean-forward="false" selection-start-line="67" selection-start-column="72" selection-end-line="67" selection-end-column="72" />
|
||||
<state relative-caret-position="75">
|
||||
<caret line="3" column="0" lean-forward="false" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="38" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/cookbook/templates/new_category.html">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="50">
|
||||
<caret line="2" column="31" lean-forward="false" selection-start-line="2" selection-start-column="31" selection-end-line="2" selection-end-column="31" />
|
||||
<folding />
|
||||
</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="49" lean-forward="false" selection-start-line="0" selection-start-column="49" selection-end-line="0" selection-end-column="49" />
|
||||
<folding />
|
||||
</state>
|
||||
</provider>
|
||||
|
||||
@ -5,9 +5,16 @@
|
||||
|
||||
{% block content %}
|
||||
|
||||
<h1>Übersicht</h1>
|
||||
<h3>
|
||||
Rezepte
|
||||
</h3>
|
||||
|
||||
|
||||
{% render_table recipes %}
|
||||
{% if recipes %}
|
||||
{% render_table recipes %}
|
||||
{% else %}
|
||||
<div class="alert alert-danger" role="alert">
|
||||
Log dich ein um die Rezepte zu sehen!
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{% endblock %}
|
||||
@ -1,5 +1,7 @@
|
||||
{% extends "base.html" %}
|
||||
|
||||
{% block title %}Neue Kategorie{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
<h3>
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
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
|
||||
@ -6,9 +7,12 @@ from cookbook.tables import RecipeTable
|
||||
|
||||
|
||||
def index(request):
|
||||
table = RecipeTable(Recipe.objects.all())
|
||||
RequestConfig(request, paginate={'per_page': 3}).configure(table)
|
||||
return render(request, 'index.html', {'recipes': table})
|
||||
if request.user.is_authenticated:
|
||||
table = RecipeTable(Recipe.objects.all())
|
||||
RequestConfig(request, paginate={'per_page': 3}).configure(table)
|
||||
return render(request, 'index.html', {'recipes': table})
|
||||
else:
|
||||
return render(request, 'index.html')
|
||||
|
||||
|
||||
@login_required
|
||||
@ -39,7 +43,7 @@ def new_category(request):
|
||||
else:
|
||||
form = CategoryForm()
|
||||
|
||||
return render(request, 'new_recipe.html', {'form': form})
|
||||
return render(request, 'new_category.html', {'form': form})
|
||||
|
||||
|
||||
@login_required
|
||||
|
||||
BIN
db.sqlite3
BIN
db.sqlite3
Binary file not shown.
Loading…
Reference in New Issue
Block a user