Change pagination in group list

diff --git a/snf-astakos-app/astakos/im/templates/im/astakosgroup_list.html b/snf-astakos-app/astakos/im/templates/im/astakosgroup_list.html
index 01e2d5b..d545b10 100644 (file)
--- a/snf-astakos-app/astakos/im/templates/im/astakosgroup_list.html
+++ b/snf-astakos-app/astakos/im/templates/im/astakosgroup_list.html
@@ -43,6 +43,7 @@
         
     {% endif %}
     {% with page_obj.object_list as object_list %}
+    <!-- Search group -->
     {% if object_list %}
         <div class="full-dotted">
                <form method="GET" class="minimal" action=""> 
@@ -146,7 +147,10 @@
             </span>
                </p>
    </div>
-      {% else %}
+      <!-- Group listing -->
+        {% else %}
+            {% with own_page|concat:own_sorting as args %}
+            {% with mine|paginate:args as mine %}
                {% if mine %}
                    <div class="full-dotted">
                                        <form method="GET" class="minimal" action="">
@@ -222,6 +226,11 @@
                           </div>
                                 
                {% endif %}
+               {% endwith %}
+            {% endwith %}
+               
+               {% with other_page|concat:other_sorting as args %}
+            {% with other|paginate:args as other %}
                {% if other %}  
                        <div class="full-dotted">
                                <form method="GET" class="minimal" action=""> 
@@ -316,6 +325,9 @@
                           </div>
                                 
                        {% endif %}
+                       {% endwith %}
+            {% endwith %}
+               
             {% if q %}
                 <h2>No groups found!</h2>
             {% endif %}

diff --git a/snf-astakos-app/astakos/im/templatetags/filters.py b/snf-astakos-app/astakos/im/templatetags/filters.py
index 80e5875..04320cf 100644 (file)
--- a/snf-astakos-app/astakos/im/templatetags/filters.py
+++ b/snf-astakos-app/astakos/im/templatetags/filters.py
@@ -101,8 +101,12 @@ def paginate(l, args):
         if isinstance(l, QuerySet):
             l = l.order_by(sorting)
         elif isinstance(l, list):
-            l.sort(key=lambda i: getattr(i, sorting))
-        
+            default = ''
+            if sorting.endswith('_date'):
+                default = datetime.datetime.utcfromtimestamp(0)
+            l.sort(key=lambda i: getattr(i, sorting) \
+                        if getattr(i, sorting) else default)
+            
     paginator = Paginator(l, PAGINATE_BY)
     
     try:

diff --git a/snf-astakos-app/astakos/im/views.py b/snf-astakos-app/astakos/im/views.py
index 0b77f0d..406b4d9 100644 (file)
--- a/snf-astakos-app/astakos/im/views.py
+++ b/snf-astakos-app/astakos/im/views.py
@@ -47,7 +47,6 @@ from django.db import transaction
 from django.db.models import Q
 from django.db.utils import IntegrityError
 from django.forms.fields import URLField
-from django.db.models.fields import DateTimeField
 from django.http import HttpResponse, HttpResponseBadRequest, HttpResponseForbidden, \
     HttpResponseRedirect, HttpResponseBadRequest, Http404
 from django.shortcuts import redirect
@@ -58,7 +57,6 @@ from django.views.generic.create_update import (create_object, delete_object,
                                                 get_model_and_form_class)
 from django.views.generic.list_detail import object_list, object_detail
 from django.http import HttpResponseBadRequest
-from django.core.paginator import Paginator, InvalidPage
 from django.core.xheaders import populate_xheaders
 
 from astakos.im.models import (
@@ -78,9 +76,8 @@ from astakos.im.functions import (send_feedback, SendMailError,
                                   switch_account_to_shibboleth,
                                   send_admin_notification,
                                   SendNotificationError)
-from astakos.im.settings import (
-    COOKIE_NAME, COOKIE_DOMAIN, SITENAME, LOGOUT_NEXT,
-    LOGGING_LEVEL, PAGINATE_BY)
+from astakos.im.settings import (COOKIE_NAME, COOKIE_DOMAIN, SITENAME,
+                                 LOGOUT_NEXT, LOGGING_LEVEL, PAGINATE_BY)
 from astakos.im.tasks import request_billing
 
 logger = logging.getLogger(__name__)
@@ -754,39 +751,14 @@ def group_list(request):
             d['own'].append(g)
         else:
             d['other'].append(g)
-    
-    d.setdefault('own', [])
-    d.setdefault('other', [])
-    for k, l in d.iteritems():
-        page = request.GET.get('%s_page' % k, 1)
-        sorting = globals()['%s_sorting' % k] = request.GET.get('%s_sorting' % k)
-        if sorting:
-            sort_form = AstakosGroupSortForm({'sort_by': sorting})
-            if sort_form.is_valid():
-                sort_field = q._model_fields.get(sorting)
-                default = _get_default(sort_field)
-                l.sort(key=lambda i: getattr(i, sorting) if getattr(i, sorting) else default)
-                globals()['%s_sorting' % k] = sorting
-        paginator = Paginator(l, PAGINATE_BY)
-        
-        try:
-            page_number = int(page)
-        except ValueError:
-            if page == 'last':
-                page_number = paginator.num_pages
-            else:
-                # Page is not 'last', nor can it be converted to an int.
-                raise Http404
-        try:
-            page_obj = globals()['%s_page_obj' % k] = paginator.page(page_number)
-        except InvalidPage:
-            raise Http404
     return object_list(request, queryset=none,
                        extra_context={'is_search':False,
-                                      'mine': own_page_obj,
-                                      'other': other_page_obj,
-                                      'own_sorting': own_sorting,
-                                      'other_sorting': other_sorting
+                                      'mine': d['own'],
+                                      'other': d['other'],
+                                      'own_sorting': request.GET.get('own_sorting'),
+                                      'own_page': request.GET.get('own_page', 1),
+                                      'other_sorting': request.GET.get('other_sorting'),
+                                      'other_page': request.GET.get('other_page', 1),
                                       })
 
 
@@ -1109,12 +1081,4 @@ def _clear_billing_data(data):
     data['bill_diskspace'] = filter(servicefilter('diskspace'), data['bill'])
     data['bill_addcredits'] = filter(servicefilter('addcredits'), data['bill'])
         
-    return data
-
-
-def _get_default(field):
-    if isinstance(field, DateTimeField):
-        return datetime.utcfromtimestamp(0)
-    elif isinstance(field, int):
-        return 0
-    return ''
\ No newline at end of file
+    return data
\ No newline at end of file