Compare commits
3 commits
8cc2f903ee
...
a5519d1fb5
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a5519d1fb5 | ||
|
|
b8c3643c31 | ||
|
|
a415c45f3b |
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -61,6 +61,7 @@ cover/
|
|||
local_settings.py
|
||||
db.sqlite3
|
||||
db.sqlite3-journal
|
||||
/media/
|
||||
|
||||
# Flask stuff:
|
||||
instance/
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ from django.urls import reverse
|
|||
|
||||
class Recipe(models.Model):
|
||||
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:
|
||||
return self.title
|
||||
|
|
@ -33,7 +33,7 @@ class Recipe(models.Model):
|
|||
|
||||
class Version(models.Model):
|
||||
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)
|
||||
user = models.ForeignKey(User, on_delete=models.PROTECT, null=False, blank=False)
|
||||
author = models.CharField(max_length=30, blank=True)
|
||||
|
|
|
|||
|
|
@ -32,5 +32,5 @@
|
|||
{% endfor %}
|
||||
</ul>
|
||||
<p>{{ version.body }}</p>
|
||||
<img src="{{ version.img.url }}" alt="">
|
||||
{% if version.img %}<img src="{{ version.img.url }}" alt="">{% endif %}
|
||||
{% endblock %}
|
||||
|
|
|
|||
|
|
@ -23,9 +23,9 @@ from . import views
|
|||
urlpatterns = [
|
||||
path('', views.recipes, name='recipes'),
|
||||
path('add-recipe/', views.add_recipe, name='add-recipe'),
|
||||
path('<slug:slug>/add-version/', views.add_version, name='add-version'),
|
||||
path('<slug: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('<slug:slug_recipe>/<slug:slug_version>/', views.version, name='version'),
|
||||
path('<slug:slug>/', views.recipe, name='recipe'),
|
||||
path('<str:slug>/add-version/', views.add_version, name='add-version'),
|
||||
path('<str:slug>/edit-recipe/', views.edit_recipe, name='edit-recipe'),
|
||||
path('<str:slug_recipe>/<str:slug_version>/edit-version/', views.edit_version, name='edit-version'),
|
||||
path('<str:slug_recipe>/<str:slug_version>/', views.version, name='version'),
|
||||
path('<str:slug>/', views.recipe, name='recipe'),
|
||||
]
|
||||
|
|
|
|||
Loading…
Reference in a new issue