marcel/linkding
1
0
Fork 0
mirror of https://github.com/sissbruecker/linkding.git synced 2025-08-15 06:29:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Filter tags for archived/unarchived (#46)

Browse Source
This commit is contained in:
Sascha Ißbrücker
2021-02-14 11:43:09 +01:00
parent be7b92d608
commit 0db7610d68
3 changed files with 82 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
bookmarks/views/bookmarks.py
View File

@@ -9,7 +9,6 @@ from django.urls import reverse
from bookmarks import queries
from bookmarks.models import Bookmark, BookmarkForm, build_tag_string
from bookmarks.services.bookmarks import create_bookmark, update_bookmark, archive_bookmark, unarchive_bookmark
from bookmarks.queries import get_user_tags
_default_page_size = 30
@@ -18,8 +17,9 @@ _default_page_size = 30
def index(request):
query_string = request.GET.get('q')
query_set = queries.query_bookmarks(request.user, query_string)
tags = queries.query_bookmark_tags(request.user, query_string)
base_url = reverse('bookmarks:index')
context = get_bookmark_view_context(request, query_set, base_url)
context = get_bookmark_view_context(request, query_set, tags, base_url)
return render(request, 'bookmarks/index.html', context)
@@ -27,17 +27,17 @@ def index(request):
def archived(request):
query_string = request.GET.get('q')
query_set = queries.query_archived_bookmarks(request.user, query_string)
tags = queries.query_archived_bookmark_tags(request.user, query_string)
base_url = reverse('bookmarks:archived')
context = get_bookmark_view_context(request, query_set, base_url)
context = get_bookmark_view_context(request, query_set, tags, base_url)
return render(request, 'bookmarks/archive.html', context)
def get_bookmark_view_context(request, query_set, base_url):
def get_bookmark_view_context(request, query_set, tags, base_url):
page = request.GET.get('page')
query_string = request.GET.get('q')
paginator = Paginator(query_set, _default_page_size)
bookmarks = paginator.get_page(page)
tags = queries.query_tags(request.user, query_string)
tag_names = [tag.name for tag in tags]
tags_string = build_tag_string(tag_names, ' ')
return_url = generate_return_url(base_url, page, query_string)
@@ -90,7 +90,7 @@ def new(request):
if initial_auto_close:
form.initial['auto_close'] = 'true'
all_tags = get_user_tags(request.user)
all_tags = queries.get_user_tags(request.user)
context = {
'form': form,
'auto_close': initial_auto_close,
@@ -119,7 +119,7 @@ def edit(request, bookmark_id: int):
form.initial['tag_string'] = build_tag_string(bookmark.tag_names, ' ')
form.initial['return_url'] = return_url
all_tags = get_user_tags(request.user)
all_tags = queries.get_user_tags(request.user)
context = {
'form': form,