Skip to content

Search by notes #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vkcz wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Search by notes #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
48008c8
search by notes
vkcz Apr 3, 2022
75200bc
checkbox to search in notes
vkcz Apr 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion qdb/templates/qdb/search.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<form class="search" action="/search">
<div><label>Find:</label><input value="{{ query }}" type="text" name="q"></div>
<div><label>Tag:</label><select style="width: 100%" class="tag-input" name="tag"></select></div>
<div><label>Search in notes instead:</label><input type="checkbox" name="sn"></div>
<button type="submit">Search</button>&nbsp;
<button type="reset" onclick="resetSelect()">Clear</button>
</form>
Expand Down Expand Up @@ -36,4 +37,4 @@
$('.tag-input').empty().trigger('change')
}
</script>
{% endblock %}
{% endblock %}
3 changes: 2 additions & 1 deletion qdb/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,8 @@ def search(request):
template = loader.get_template('qdb/search.html')
query = request.GET.get('q', '')
tag = request.GET.get('tag', '')
quote_list = quotes.filter(content__contains=query)
sn = request.GET.get('sn', '')
quote_list = quotes.filter(notes__contains=query) if sn else quotes.filter(content__contains=query)
if tag: quote_list = quote_list.filter(tags__name__in=[tag])
quote_list = quote_list.order_by('-timestamp')
return get_quotes('Search Quotes', quote_list, request, query=query, tag=tag)
Expand Down