extern/django-helpdesk
1
0
Fork 1
mirror of https://github.com/django-helpdesk/django-helpdesk.git synced 2025-05-31 06:55:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add OR syntax to search

Browse Source
This commit is contained in:
Timothy Hobbs 2019-11-01 17:03:17 +01:00
parent 2fbd4818c1
commit d32d23e4e2
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
helpdesk/query.py
View File

@ -56,18 +56,23 @@ def get_search_filter_args(search):
return Q(queue__title__icontains=search[len('queue:'):]) return Q(queue__title__icontains=search[len('queue:'):])
if search.startswith('priority:'): if search.startswith('priority:'):
return Q(priority__icontains=search[len('priority:'):]) return Q(priority__icontains=search[len('priority:'):])
return ( filter = Q()
Q(id__icontains=search) | for subsearch in search.split("OR"):
Q(title__icontains=search) | subsearch = subsearch.strip()
Q(description__icontains=search) | filter = (
Q(priority__icontains=search) | filter |
Q(resolution__icontains=search) | Q(id__icontains=subsearch) |
Q(submitter_email__icontains=search) | Q(title__icontains=subsearch) |
Q(assigned_to__email__icontains=search) | Q(description__icontains=subsearch) |
Q(ticketcustomfieldvalue__value__icontains=search) | Q(priority__icontains=subsearch) |
Q(created__icontains=search) | Q(resolution__icontains=subsearch) |
Q(due_date__icontains=search) Q(submitter_email__icontains=subsearch) |
) Q(assigned_to__email__icontains=subsearch) |
Q(ticketcustomfieldvalue__value__icontains=subsearch) |
Q(created__icontains=subsearch) |
Q(due_date__icontains=subsearch)
)
return filter
DATATABLES_ORDER_COLUMN_CHOICES = Choices( DATATABLES_ORDER_COLUMN_CHOICES = Choices(

2
helpdesk/templates/helpdesk/filters/keywords.html
View File

@ -9,5 +9,5 @@
<div class="col col-sm-6"> <div class="col col-sm-6">
<button class='filterBuilderRemove btn btn-danger btn-sm float-right'><i class="fas fa-trash-alt"></i></button> <button class='filterBuilderRemove btn btn-danger btn-sm float-right'><i class="fas fa-trash-alt"></i></button>
</div> </div>
<p class='filterHelp'>{% trans "Keywords are case-insensitive, and will be looked for pretty much everywhere possible. Prepend with 'queue:' or 'priority:' to search by queue or priority." %}</p> <p class='filterHelp'>{% trans "Keywords are case-insensitive, and will be looked for pretty much everywhere possible. Prepend with 'queue:' or 'priority:' to search by queue or priority. You can also use the keyword OR to combine multiple searches." %}</p>
</div> </div>