diff --git a/cocktail_list/__pycache__/views.cpython-37.pyc b/cocktail_list/__pycache__/views.cpython-37.pyc
index 7fa50e7..497a0a1 100644
Binary files a/cocktail_list/__pycache__/views.cpython-37.pyc and b/cocktail_list/__pycache__/views.cpython-37.pyc differ
diff --git a/cocktail_list/templates/cerca.html b/cocktail_list/templates/cerca.html
index f9db402..44af7ac 100644
--- a/cocktail_list/templates/cerca.html
+++ b/cocktail_list/templates/cerca.html
@@ -12,9 +12,9 @@
+
+ {% for cocktails in cocktail %}
{% if forloop.first %} {% endif %}
diff --git a/cocktail_list/views.py b/cocktail_list/views.py
index 4d321c1..da15fde 100644
--- a/cocktail_list/views.py
+++ b/cocktail_list/views.py
@@ -1,7 +1,6 @@
from django.shortcuts import render,get_object_or_404,redirect
from .models import Cocktail,Ingredienti,Strumenti,Bicchieri
import random
-import time
# Create your views here.
@@ -63,14 +62,12 @@ def bicchieri_cocktail(request):
def cerca(request):
if "q" in request.GET:
querystring = request.GET.get("q")
- if len(querystring) == 0:
+ if len(querystring) < 3:
return redirect("cerca")
all_ingredients = Cocktail.objects.all()
searching_ingred = Cocktail.objects.none()
for one_ingredient in querystring.split(","):
- print(one_ingredient)
searching_ingred = searching_ingred.union(searching_ingred, all_ingredients.filter(ingredienti__ingrediente__icontains=one_ingredient))
- print(searching_ingred)
# ingrediente = Cocktail.objects.filter(ingredienti__ingrediente__icontains=querystring).order_by("-nome_cocktail")
cocktail = Cocktail.objects.filter(nome_cocktail__icontains=querystring).order_by("-nome_cocktail")
context = {"querystring":querystring,"cocktail":cocktail,"ingrediente":searching_ingred}