cgiacofei/TandoorRecipes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed search settings not working with sqlite DB

Browse Source
This commit is contained in:
vabene1111 2022-09-23 16:16:44 +02:00
parent 16528c4c89
commit d02b253242
2 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cookbook/templates/settings.html
View File

@ -67,6 +67,7 @@
function applyPreset(preset) { function applyPreset(preset) {
$('#id_search-preset').val(preset); $('#id_search-preset').val(preset);
$('#id_search-search').val('plain');
$('#search_form_button').click(); $('#search_form_button').click();
} }
</script> </script>

56
cookbook/views/views.py
View File

@ -215,7 +215,6 @@ def shopping_settings(request):
if request.method == "POST": if request.method == "POST":
if 'search_form' in request.POST: if 'search_form' in request.POST:
active_tab = 'search'
search_form = SearchPreferenceForm(request.POST, prefix='search') search_form = SearchPreferenceForm(request.POST, prefix='search')
if search_form.is_valid(): if search_form.is_valid():
if not sp: if not sp:
@ -226,7 +225,28 @@ def shopping_settings(request):
+ len(search_form.cleaned_data['trigram']) + len(search_form.cleaned_data['trigram'])
+ len(search_form.cleaned_data['fulltext']) + len(search_form.cleaned_data['fulltext'])
) )
if fields_searched == 0: if search_form.cleaned_data['preset'] == 'fuzzy':
sp.search = SearchPreference.SIMPLE
sp.lookup = True
sp.unaccent.set([SearchFields.objects.get(name='Name')])
sp.icontains.set([SearchFields.objects.get(name='Name')])
sp.istartswith.clear()
sp.trigram.set([SearchFields.objects.get(name='Name')])
sp.fulltext.clear()
sp.trigram_threshold = 0.2
sp.save()
elif search_form.cleaned_data['preset'] == 'precise':
sp.search = SearchPreference.WEB
sp.lookup = True
sp.unaccent.set(SearchFields.objects.all())
# full text on food is very slow, add search_vector field and index it (including Admin functions and postsave signal to rebuild index)
sp.icontains.set([SearchFields.objects.get(name='Name')])
sp.istartswith.set([SearchFields.objects.get(name='Name')])
sp.trigram.clear()
sp.fulltext.set(SearchFields.objects.filter(name__in=['Ingredients']))
sp.trigram_threshold = 0.2
sp.save()
elif fields_searched == 0:
search_form.add_error(None, _('You must select at least one field to search!')) search_form.add_error(None, _('You must select at least one field to search!'))
search_error = True search_error = True
elif search_form.cleaned_data['search'] in ['websearch', 'raw'] and len( elif search_form.cleaned_data['search'] in ['websearch', 'raw'] and len(
@ -247,29 +267,9 @@ def shopping_settings(request):
sp.trigram.set(search_form.cleaned_data['trigram']) sp.trigram.set(search_form.cleaned_data['trigram'])
sp.fulltext.set(search_form.cleaned_data['fulltext']) sp.fulltext.set(search_form.cleaned_data['fulltext'])
sp.trigram_threshold = search_form.cleaned_data['trigram_threshold'] sp.trigram_threshold = search_form.cleaned_data['trigram_threshold']
if search_form.cleaned_data['preset'] == 'fuzzy':
sp.search = SearchPreference.SIMPLE
sp.lookup = True
sp.unaccent.set([SearchFields.objects.get(name='Name')])
sp.icontains.set([SearchFields.objects.get(name='Name')])
sp.istartswith.clear()
sp.trigram.set([SearchFields.objects.get(name='Name')])
sp.fulltext.clear()
sp.trigram_threshold = 0.2
if search_form.cleaned_data['preset'] == 'precise':
sp.search = SearchPreference.WEB
sp.lookup = True
sp.unaccent.set(SearchFields.objects.all())
# full text on food is very slow, add search_vector field and index it (including Admin functions and postsave signal to rebuild index)
sp.icontains.set([SearchFields.objects.get(name='Name')])
sp.istartswith.set([SearchFields.objects.get(name='Name')])
sp.trigram.clear()
sp.fulltext.set(SearchFields.objects.filter(name__in=['Ingredients']))
sp.trigram_threshold = 0.2
sp.save() sp.save()
else:
search_error = True
fields_searched = len(sp.icontains.all()) + len(sp.istartswith.all()) + len(sp.trigram.all()) + len( fields_searched = len(sp.icontains.all()) + len(sp.istartswith.all()) + len(sp.trigram.all()) + len(
sp.fulltext.all()) sp.fulltext.all())
@ -281,10 +281,10 @@ def shopping_settings(request):
# these fields require postgresql - just disable them if postgresql isn't available # these fields require postgresql - just disable them if postgresql isn't available
if not settings.DATABASES['default']['ENGINE'] in ['django.db.backends.postgresql_psycopg2', if not settings.DATABASES['default']['ENGINE'] in ['django.db.backends.postgresql_psycopg2',
'django.db.backends.postgresql']: 'django.db.backends.postgresql']:
search_form.fields['search'].disabled = True sp.search = SearchPreference.SIMPLE
search_form.fields['lookup'].disabled = True sp.trigram.clear()
search_form.fields['trigram'].disabled = True sp.fulltext.clear()
search_form.fields['fulltext'].disabled = True sp.save()
return render(request, 'settings.html', { return render(request, 'settings.html', {
'search_form': search_form, 'search_form': search_form,