dani/django-ram
1
0
Fork 0
mirror of https://github.com/daniviga/django-ram.git synced 2025-08-04 21:27:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Run black on py

Browse Source
This commit is contained in:
Daniele Viganò
2022-04-19 14:25:29 +02:00
parent 13cc531c5d
commit b925af1e7a
13 changed files with 95 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
ram/portal/views.py
View File

@@ -24,9 +24,7 @@ class GetHome(View):
except EmptyPage:
rolling_stock = paginator.page(paginator.num_pages)
return render(request, "home.html", {
"rolling_stock": rolling_stock
})
return render(request, "home.html", {"rolling_stock": rolling_stock})
class GetHomeFiltered(View):
@@ -37,17 +35,23 @@ class GetHomeFiltered(View):
# query = {
# _filter: _value
# }
query = reduce(operator.or_, (Q(
Q(rolling_class__identifier__icontains=s) |
Q(rolling_class__description__icontains=s) |
Q(rolling_class__type__type__icontains=s) |
Q(road_number__icontains=s) |
Q(rolling_class__company__name__icontains=s) |
Q(rolling_class__company__country__icontains=s) |
Q(manufacturer__name__icontains=s) |
Q(scale__scale__icontains=s) |
Q(tags__name__icontains=s)
) for s in search.split()))
query = reduce(
operator.or_,
(
Q(
Q(rolling_class__identifier__icontains=s)
| Q(rolling_class__description__icontains=s)
| Q(rolling_class__type__type__icontains=s)
| Q(road_number__icontains=s)
| Q(rolling_class__company__name__icontains=s)
| Q(rolling_class__company__country__icontains=s)
| Q(manufacturer__name__icontains=s)
| Q(scale__scale__icontains=s)
| Q(tags__name__icontains=s)
)
for s in search.split()
),
)
rolling_stock = RollingStock.objects.filter(query)
paginator = Paginator(rolling_stock, site_conf.items_per_page)
@@ -63,10 +67,11 @@ class GetHomeFiltered(View):
def get(self, request, search, page=1):
rolling_stock = self.run_search(request, search, page)
return render(request, "search.html", {
"search": search,
"rolling_stock": rolling_stock
})
return render(
request,
"search.html",
{"search": search, "rolling_stock": rolling_stock},
)
def post(self, request, page=1):
search = request.POST.get("search")
@@ -74,16 +79,21 @@ class GetHomeFiltered(View):
raise Http404
rolling_stock = self.run_search(request, search, page)
return render(request, "search.html", {
"search": search,
"rolling_stock": rolling_stock
})
return render(
request,
"search.html",
{"search": search, "rolling_stock": rolling_stock},
)
class GetRollingStock(View):
def get(self, request, uuid):
rolling_stock = RollingStock.objects.get(uuid=uuid)
return render(request, "page.html", {
"rolling_stock": rolling_stock,
})
return render(
request,
"page.html",
{
"rolling_stock": rolling_stock,
},
)