mirror of
https://github.com/sissbruecker/linkding
synced 2024-11-10 06:04:15 +00:00
Allow pre-filling notes in new bookmark form (#812)
This commit is contained in:
parent
1c6e5902db
commit
b30486317d
3 changed files with 29 additions and 1 deletions
|
@ -169,7 +169,9 @@ class BookmarkForm(forms.ModelForm):
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def has_notes(self):
|
def has_notes(self):
|
||||||
return self.instance and self.instance.notes
|
return self.initial.get("notes", None) or (
|
||||||
|
self.instance and self.instance.notes
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class BookmarkSearch:
|
class BookmarkSearch:
|
||||||
|
|
|
@ -100,6 +100,29 @@ class BookmarkNewViewTestCase(TestCase, BookmarkFactoryMixin):
|
||||||
html,
|
html,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
def test_should_prefill_notes_from_url_parameter(self):
|
||||||
|
response = self.client.get(
|
||||||
|
reverse("bookmarks:new")
|
||||||
|
+ "?notes=%2A%2AFind%2A%2A%20more%20info%20%5Bhere%5D%28http%3A%2F%2Fexample.com%29"
|
||||||
|
)
|
||||||
|
html = response.content.decode()
|
||||||
|
|
||||||
|
self.assertInHTML(
|
||||||
|
"""
|
||||||
|
<details class="notes" open="">
|
||||||
|
<summary>
|
||||||
|
<span class="form-label d-inline-block">Notes</span>
|
||||||
|
</summary>
|
||||||
|
<label for="id_notes" class="text-assistive">Notes</label>
|
||||||
|
<textarea name="notes" cols="40" rows="8" class="form-input" id="id_notes">**Find** more info [here](http://example.com)</textarea>
|
||||||
|
<div class="form-input-hint">
|
||||||
|
Additional notes, supports Markdown.
|
||||||
|
</div>
|
||||||
|
</details>
|
||||||
|
""",
|
||||||
|
html,
|
||||||
|
)
|
||||||
|
|
||||||
def test_should_enable_auto_close_when_specified_in_url_parameter(self):
|
def test_should_enable_auto_close_when_specified_in_url_parameter(self):
|
||||||
response = self.client.get(reverse("bookmarks:new") + "?auto_close")
|
response = self.client.get(reverse("bookmarks:new") + "?auto_close")
|
||||||
html = response.content.decode()
|
html = response.content.decode()
|
||||||
|
|
|
@ -192,6 +192,7 @@ def new(request):
|
||||||
initial_url = request.GET.get("url")
|
initial_url = request.GET.get("url")
|
||||||
initial_title = request.GET.get("title")
|
initial_title = request.GET.get("title")
|
||||||
initial_description = request.GET.get("description")
|
initial_description = request.GET.get("description")
|
||||||
|
initial_notes = request.GET.get("notes")
|
||||||
initial_auto_close = "auto_close" in request.GET
|
initial_auto_close = "auto_close" in request.GET
|
||||||
initial_mark_unread = request.user.profile.default_mark_unread
|
initial_mark_unread = request.user.profile.default_mark_unread
|
||||||
|
|
||||||
|
@ -214,6 +215,8 @@ def new(request):
|
||||||
form.initial["title"] = initial_title
|
form.initial["title"] = initial_title
|
||||||
if initial_description:
|
if initial_description:
|
||||||
form.initial["description"] = initial_description
|
form.initial["description"] = initial_description
|
||||||
|
if initial_notes:
|
||||||
|
form.initial["notes"] = initial_notes
|
||||||
if initial_auto_close:
|
if initial_auto_close:
|
||||||
form.initial["auto_close"] = "true"
|
form.initial["auto_close"] = "true"
|
||||||
if initial_mark_unread:
|
if initial_mark_unread:
|
||||||
|
|
Loading…
Reference in a new issue