marcel/linkding
1
0
Fork 0
mirror of https://github.com/sissbruecker/linkding.git synced 2025-09-15 21:49:44 +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

26
bookmarks/queries.py
View File

@@ -17,6 +17,16 @@ class Concat(Aggregate):
**extra)
def query_bookmarks(user: User, query_string: str) -> QuerySet:
return _base_bookmarks_query(user, query_string) \
.filter(is_archived=False)
def query_archived_bookmarks(user: User, query_string: str) -> QuerySet:
return _base_bookmarks_query(user, query_string) \
.filter(is_archived=True)
def _base_bookmarks_query(user: User, query_string: str) -> QuerySet:
# Add aggregated tag info to bookmark instances
query_set = Bookmark.objects \
@@ -51,17 +61,19 @@ def _base_bookmarks_query(user: User, query_string: str) -> QuerySet:
return query_set
def query_bookmarks(user: User, query_string: str) -> QuerySet:
return _base_bookmarks_query(user, query_string) \
.filter(is_archived=False)
def query_bookmark_tags(user: User, query_string: str) -> QuerySet:
return _base_bookmark_tags_query(user, query_string) \
.filter(bookmark__is_archived=False) \
.distinct()
def query_archived_bookmarks(user: User, query_string: str) -> QuerySet:
return _base_bookmarks_query(user, query_string) \
.filter(is_archived=True)
def query_archived_bookmark_tags(user: User, query_string: str) -> QuerySet:
return _base_bookmark_tags_query(user, query_string) \
.filter(bookmark__is_archived=True) \
.distinct()
def query_tags(user: User, query_string: str):
def _base_bookmark_tags_query(user: User, query_string: str) -> QuerySet:
query_set = Tag.objects
# Filter for user