mirror of
https://github.com/bookwyrm-social/bookwyrm.git
synced 2024-11-26 03:21:05 +00:00
Proper markdown formatting
This commit is contained in:
parent
fefb7e582a
commit
0683ce1c33
3 changed files with 26 additions and 2 deletions
21
bookwyrm/migrations/0133_alter_listitem_notes.py
Normal file
21
bookwyrm/migrations/0133_alter_listitem_notes.py
Normal file
|
@ -0,0 +1,21 @@
|
||||||
|
# Generated by Django 3.2.11 on 2022-02-04 20:06
|
||||||
|
|
||||||
|
import bookwyrm.models.fields
|
||||||
|
from django.db import migrations
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
("bookwyrm", "0132_alter_user_preferred_language"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name="listitem",
|
||||||
|
name="notes",
|
||||||
|
field=bookwyrm.models.fields.HtmlField(
|
||||||
|
blank=True, max_length=300, null=True
|
||||||
|
),
|
||||||
|
),
|
||||||
|
]
|
|
@ -142,7 +142,7 @@ class ListItem(CollectionItemMixin, BookWyrmModel):
|
||||||
user = fields.ForeignKey(
|
user = fields.ForeignKey(
|
||||||
"User", on_delete=models.PROTECT, activitypub_field="actor"
|
"User", on_delete=models.PROTECT, activitypub_field="actor"
|
||||||
)
|
)
|
||||||
notes = fields.TextField(blank=True, null=True, max_length=300)
|
notes = fields.HtmlField(blank=True, null=True, max_length=300)
|
||||||
approved = models.BooleanField(default=True)
|
approved = models.BooleanField(default=True)
|
||||||
order = fields.IntegerField()
|
order = fields.IntegerField()
|
||||||
endorsement = models.ManyToManyField("User", related_name="endorsers")
|
endorsement = models.ManyToManyField("User", related_name="endorsers")
|
||||||
|
|
|
@ -5,6 +5,7 @@ from django.utils.decorators import method_decorator
|
||||||
from django.views import View
|
from django.views import View
|
||||||
|
|
||||||
from bookwyrm import forms, models
|
from bookwyrm import forms, models
|
||||||
|
from bookwyrm.views.status import to_markdown
|
||||||
|
|
||||||
|
|
||||||
# pylint: disable=no-self-use
|
# pylint: disable=no-self-use
|
||||||
|
@ -18,7 +19,9 @@ class ListItem(View):
|
||||||
list_item.raise_not_editable(request.user)
|
list_item.raise_not_editable(request.user)
|
||||||
form = forms.ListItemForm(request.POST, instance=list_item)
|
form = forms.ListItemForm(request.POST, instance=list_item)
|
||||||
if form.is_valid():
|
if form.is_valid():
|
||||||
form.save()
|
item = form.save(commit=False)
|
||||||
|
item.notes = to_markdown(item.notes)
|
||||||
|
item.save()
|
||||||
else:
|
else:
|
||||||
raise Exception(form.errors)
|
raise Exception(form.errors)
|
||||||
return redirect("list", list_item.book_list.id)
|
return redirect("list", list_item.book_list.id)
|
||||||
|
|
Loading…
Reference in a new issue