correciones QueryParams index
This commit is contained in:
@@ -13,7 +13,7 @@ from django.core.files.storage import FileSystemStorage
|
||||
from django.core.mail import send_mail
|
||||
from django.shortcuts import render,redirect
|
||||
from django.contrib import messages
|
||||
from django.http import HttpResponse,JsonResponse
|
||||
from django.http import HttpResponse,JsonResponse,QueryDict
|
||||
from django.contrib.auth.decorators import login_required
|
||||
from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
|
||||
from django.db.models import Q
|
||||
@@ -197,11 +197,21 @@ def index(request):
|
||||
while met:
|
||||
try:
|
||||
c = next(met)
|
||||
c.timbres_X_MES(mes=mes,year=year, PAC=PAC)
|
||||
if PAC is not None:
|
||||
c.timbres_X_MES(mes=mes,year=year, PAC=PAC)
|
||||
else:
|
||||
c.timbres_X_MES(mes=mes,year=year)
|
||||
except StopIteration:
|
||||
break
|
||||
|
||||
clientes_list =pageFunc(page,clientes_list,20)
|
||||
clientes_list =pageFunc(page,clientes_list,50)
|
||||
current_query_dict = request.GET.copy()
|
||||
current_query_dict.pop('page', None)
|
||||
|
||||
current_query_params = current_query_dict.urlencode()
|
||||
|
||||
|
||||
|
||||
|
||||
context = {
|
||||
'lista':clientes_list,
|
||||
@@ -209,6 +219,7 @@ def index(request):
|
||||
'year':year,
|
||||
'filters':filters,
|
||||
'emailForm':EmailForm(),
|
||||
'current_query_params':current_query_params
|
||||
}
|
||||
return render(request,'Clientes/index.html',context)
|
||||
|
||||
@@ -218,7 +229,7 @@ def pageFunc(page,qs,per_page):
|
||||
try:
|
||||
qs = paginator.page(page)
|
||||
except PageNotAnInteger:
|
||||
qs = Paginator.page(1)
|
||||
qs = paginator.page(1)
|
||||
except EmptyPage:
|
||||
qs = paginator.page(paginator.num_pages)
|
||||
return qs
|
||||
|
||||
Reference in New Issue
Block a user