correciones QueryParams index

Clientes/views.py

@@ -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

IMMEX/views.py

@@ -702,6 +702,3 @@ class Permisos_A24_ModelViewSet(viewsets.ModelViewSet):
         headers = self.get_success_headers(serializer.data)
         return Response(serializer.data,status=status.HTTP_201_CREATED, headers=headers)
     
-
-    # def update(self,request,*args,**kwargs):
-    #     pk=

Templates/paginator.html

@@ -47,7 +47,7 @@
   <ul class="pagination justify-content-center">
     {% if lista.has_previous %}
       <li class="page-item">
-        <a class="page-link" href="?page={{ lista.previous_page_number }}{% for i,v in filters.items %}&{{i}}={{v}}{% endfor%}" aria-label="Previous">
+        <a class="page-link" href="?{{current_query_params}}&page={{ lista.previous_page_number }}{% for i,v in filters.items %}&{{i}}={{v}}{% endfor%}" aria-label="Previous">
           <span aria-hidden="true">&laquo;</span>
         </a>
       </li>
@@ -62,7 +62,7 @@
         <li class="page-item"><a class="page-link" style="color: red;" href="#">{{ p }}</a></li>
       {% else %}
         {% comment%}
-          <li class="page-item"><a class="page-link" href="?page={{ p }}{% for i,v in filters.items %}&{{i}}={{v}}{% endfor%}">{{ p }}</a></li>
+          <li class="page-item"><a class="page-link" href="?{{current_query_params}}&page={{ p }}{% for i,v in filters.items %}&{{i}}={{v}}{% endfor%}">{{ p }}</a></li>
         {% endcomment%}
         {% endif %}
 
@@ -70,7 +70,7 @@
 
     {% if lista.has_next %}
       <li class="page-item">
-        <a class="page-link" href="?page={{ lista.next_page_number }}{% for i,v in filters.items %}&{{i}}={{v}}{% endfor%}" aria-label="Next">
+        <a class="page-link" href="?{{current_query_params}}&page={{ lista.next_page_number }}{% for i,v in filters.items %}&{{i}}={{v}}{% endfor%}" aria-label="Next">
           <span aria-hidden="true">&raquo;</span>
         </a>
       </li>