|
|
@ -4,7 +4,7 @@ from django.contrib.auth.models import User, Group |
|
|
|
from django.contrib.auth.decorators import login_required |
|
|
|
|
|
|
|
from coopeV3.acl import active_required |
|
|
|
from gestion.models import Product, Menu, Keg |
|
|
|
from gestion.models import Product, Menu, Keg, ConsumptionHistory |
|
|
|
|
|
|
|
@active_required |
|
|
|
@login_required |
|
|
@ -13,13 +13,15 @@ def search(request): |
|
|
|
if q: |
|
|
|
users = User.objects.filter(Q(username__icontains=q) | Q(first_name__icontains=q) | Q(last_name__icontains=q)) |
|
|
|
products = Product.objects.filter(name__icontains=q) |
|
|
|
last_consumptions = ConsumptionHistory.objects.select_related('product').filter(product__name__icontains=q).order_by('-date')[:10] |
|
|
|
kegs = Keg.objects.filter(name__icontains=q) |
|
|
|
menus = Menu.objects.filter(name__icontains=q) |
|
|
|
groups = Group.objects.filter(name__icontains=q) |
|
|
|
else: |
|
|
|
users = User.objects.none() |
|
|
|
products = Product.objects.none() |
|
|
|
lats_consumptions = ConsumptionHistory.objects.none() |
|
|
|
kegs = Keg.objects.none() |
|
|
|
menus = Menu.objects.none() |
|
|
|
groups = Group.objects.none() |
|
|
|
return render(request, "search/search.html", {"q": q, "users": users, "products": products, "kegs": kegs, "menus": menus, "groups": groups}) |
|
|
|
return render(request, "search/search.html", {"q": q, "users": users, "products": products, "last_consumptions": last_consumptions, "kegs": kegs, "menus": menus, "groups": groups}) |
|
|
|