Barn/django-project
1
0
Fork 0
Code Issues 6 Pull requests Packages Projects 1 Releases Activity

Compare commits

base: Barn:8cc2f903ee0a783bbac8f16abf5b3016a43b1ca3
Branches Tags
Barn:master
..
compare: Barn:a5519d1fb5434bd11d901c53f48b51aa59847e76
Branches Tags
Barn:master

3 commits
8cc2f903ee ... a5519d1fb5

Author SHA1 Message Date
Benjamin a5519d1fb5 Ignore media directory 2023-03-24 17:25:25 +01:00
Benjamin b8c3643c31 Switch to slug with allow_unicode=True 2023-03-24 16:29:43 +01:00
Benjamin a415c45f3b Add img field to version 2023-03-24 16:18:48 +01:00
4 changed files with 9 additions and 8 deletions
Show stats Expand all files Collapse all files

1
.gitignore vendored
View file

@ -61,6 +61,7 @@ cover/
local_settings.py local_settings.py
db.sqlite3 db.sqlite3
db.sqlite3-journal db.sqlite3-journal
/media/
# Flask stuff: # Flask stuff:
instance/ instance/

4
recipes/models.py
View file

@ -23,7 +23,7 @@ from django.urls import reverse
class Recipe(models.Model): class Recipe(models.Model):
title = models.CharField(max_length=100, null=False, blank=False) title = models.CharField(max_length=100, null=False, blank=False)
slug = models.SlugField(unique=True) slug = models.SlugField(unique=True, allow_unicode=True) # type: ignore
def __str__(self) -> str: def __str__(self) -> str:
return self.title return self.title
@ -33,7 +33,7 @@ class Recipe(models.Model):
class Version(models.Model): class Version(models.Model):
label = models.CharField(max_length=20, default='Original') label = models.CharField(max_length=20, default='Original')
slug = models.SlugField(max_length=20, default='original') slug = models.SlugField(max_length=20, default='original', allow_unicode=True) # type: ignore
body = models.TextField(null=True, blank=True) body = models.TextField(null=True, blank=True)
user = models.ForeignKey(User, on_delete=models.PROTECT, null=False, blank=False) user = models.ForeignKey(User, on_delete=models.PROTECT, null=False, blank=False)
author = models.CharField(max_length=30, blank=True) author = models.CharField(max_length=30, blank=True)

2
recipes/templates/version.html
View file

@ -32,5 +32,5 @@
{% endfor %} {% endfor %}
</ul> </ul>
<p>{{ version.body }}</p> <p>{{ version.body }}</p>
<img src="{{ version.img.url }}" alt=""> {% if version.img %}<img src="{{ version.img.url }}" alt="">{% endif %}
{% endblock %} {% endblock %}

10
recipes/urls.py
View file

@ -23,9 +23,9 @@ from . import views
urlpatterns = [ urlpatterns = [
path('', views.recipes, name='recipes'), path('', views.recipes, name='recipes'),
path('add-recipe/', views.add_recipe, name='add-recipe'), path('add-recipe/', views.add_recipe, name='add-recipe'),
path('<slug:slug>/add-version/', views.add_version, name='add-version'), path('<str:slug>/add-version/', views.add_version, name='add-version'),
path('<slug:slug>/edit-recipe/', views.edit_recipe, name='edit-recipe'), path('<str:slug>/edit-recipe/', views.edit_recipe, name='edit-recipe'),
path('<slug:slug_recipe>/<slug:slug_version>/edit-version/', views.edit_version, name='edit-version'), path('<str:slug_recipe>/<str:slug_version>/edit-version/', views.edit_version, name='edit-version'),
path('<slug:slug_recipe>/<slug:slug_version>/', views.version, name='version'), path('<str:slug_recipe>/<str:slug_version>/', views.version, name='version'),
path('<slug:slug>/', views.recipe, name='recipe'), path('<str:slug>/', views.recipe, name='recipe'),
] ]