forked from expo/troggle
remove logbooksearch, use site-wide search on server
This commit is contained in:
@@ -226,22 +226,6 @@ def logbookentry(request, date, slug):
|
||||
print(msg)
|
||||
return render(request, 'errors/generic.html',{'message':msg})
|
||||
|
||||
def logbookSearch(request, extra):
|
||||
'''This uses Django free text search of a text field to find the list of logbook entries.
|
||||
We need to create a search box form to set up the ?q=searchterms URL GET
|
||||
This has not been touched since we were running on Django 1.11 and probably earlier..
|
||||
A better idea is just to delete it and rely on he full text search that Wookey did.
|
||||
'''
|
||||
query_string = ''
|
||||
found_entries = None
|
||||
if ('q' in request.GET) and request.GET['q'].strip():
|
||||
query_string = request.GET['q']
|
||||
entry_query = search.get_query(query_string, ['text','title',])
|
||||
found_entries = LogbookEntry.objects.filter(entry_query)
|
||||
|
||||
return render(request,'logbooksearch.html',
|
||||
{ 'query_string': query_string, 'found_entries': found_entries, })
|
||||
|
||||
def get_people(request, expeditionslug):
|
||||
exp = Expedition.objects.get(year = expeditionslug)
|
||||
return render(request,'options.html', {"items": [(pe.slug, pe.name) for pe in exp.personexpedition_set.all()]})
|
||||
|
||||
Reference in New Issue
Block a user