From 768f1346a31ab2d6994bd9e3311b28aeec2019d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sascha=20I=C3=9Fbr=C3=BCcker?= Date: Thu, 24 Aug 2023 10:22:05 +0200 Subject: [PATCH] Make search autocomplete respect link target setting (#513) --- bookmarks/frontend/components/SearchAutoComplete.svelte | 3 ++- bookmarks/templates/bookmarks/search.html | 1 + bookmarks/templatetags/bookmarks.py | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/bookmarks/frontend/components/SearchAutoComplete.svelte b/bookmarks/frontend/components/SearchAutoComplete.svelte index ee11238..faeaf7a 100644 --- a/bookmarks/frontend/components/SearchAutoComplete.svelte +++ b/bookmarks/frontend/components/SearchAutoComplete.svelte @@ -11,6 +11,7 @@ export let mode = ''; export let apiClient; export let filters; + export let linkTarget = '_blank'; let isFocus = false; let isOpen = false; @@ -164,7 +165,7 @@ close() } if (suggestion.type === 'bookmark') { - window.open(suggestion.bookmark.url, '_blank') + window.open(suggestion.bookmark.url, linkTarget) close() } if (suggestion.type === 'tag') { diff --git a/bookmarks/templates/bookmarks/search.html b/bookmarks/templates/bookmarks/search.html index 1d49def..a57cf38 100644 --- a/bookmarks/templates/bookmarks/search.html +++ b/bookmarks/templates/bookmarks/search.html @@ -34,6 +34,7 @@ value: '{{ filters.query }}', tags: uniqueTags, mode: '{{ mode }}', + linkTarget: '{{ request.user_profile.bookmark_link_target }}', apiClient, filters, } diff --git a/bookmarks/templatetags/bookmarks.py b/bookmarks/templatetags/bookmarks.py index fd4754e..271d5b8 100644 --- a/bookmarks/templatetags/bookmarks.py +++ b/bookmarks/templatetags/bookmarks.py @@ -23,6 +23,7 @@ def bookmark_search(context, filters: BookmarkFilters, tags: [Tag], mode: str = tag_names = [tag.name for tag in tags] tags_string = build_tag_string(tag_names, ' ') return { + 'request': context['request'], 'filters': filters, 'tags_string': tags_string, 'mode': mode,