Compare commits

...

1 Commits

Author SHA1 Message Date
John Bintz b09ea26d66 Add !untagged search to find untagged bookmarks
* Add .nvmrc file for easier Node development environment setup
2021-01-08 18:43:16 -05:00
4 changed files with 19 additions and 4 deletions

1
.nvmrc Normal file
View File

@ -0,0 +1 @@
14

View File

@ -40,11 +40,20 @@ def query_bookmarks(user: User, query_string: str):
| Q(url__contains=term) | Q(url__contains=term)
) )
for tag_name in query['tag_names']: if 'untagged' in query['special_searches']:
print(query_set)
query_set = query_set.filter( query_set = query_set.filter(
tags__name__iexact=tag_name tags=None
) )
print(query_set)
else:
for tag_name in query['tag_names']:
query_set = query_set.filter(
tags__name__iexact=tag_name
)
# Sort by modification date # Sort by modification date
query_set = query_set.order_by('-date_modified') query_set = query_set.order_by('-date_modified')
@ -94,11 +103,14 @@ def _parse_query_string(query_string):
keywords = query_string.strip().split(' ') keywords = query_string.strip().split(' ')
keywords = [word for word in keywords if word] keywords = [word for word in keywords if word]
search_terms = [word for word in keywords if word[0] != '#'] search_terms = [word for word in keywords if (word[0] != '#' and word[0] != "!")]
tag_names = [word[1:] for word in keywords if word[0] == '#'] tag_names = [word[1:] for word in keywords if word[0] == '#']
tag_names = unique(tag_names, str.lower) tag_names = unique(tag_names, str.lower)
special_searches = [word[1:] for word in keywords if word[0] == "!"]
return { return {
'search_terms': search_terms, 'search_terms': search_terms,
'tag_names': tag_names, 'tag_names': tag_names,
'special_searches': special_searches
} }

View File

@ -20,4 +20,6 @@
{% endfor %} {% endfor %}
</p> </p>
{% endfor %} {% endfor %}
<hr />
<a href="?q=!untagged">Untagged</a>
</div> </div>

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "linkding", "name": "linkding",
"version": "1.0.0", "version": "1.1.1",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {