mango r243 - in branches/django: . mango www

[ovitters svn gnome org]

Author: ovitters
Date: Mon Jun 23 17:29:47 2008
New Revision: 243
URL: http://svn.gnome.org/viewvc/mango?rev=243&view=rev

Log:
	* mango/views.py (list_mirrors): Show mirrors per page (25).
	* www/list_ftpmirrors.xsl: Correct link to list_mirrors view.


Modified:
   branches/django/   (props changed)
   branches/django/ChangeLog
   branches/django/mango/views.py
   branches/django/www/list_ftpmirrors.xsl

Modified: branches/django/mango/views.py
==============================================================================
--- branches/django/mango/views.py	(original)
+++ branches/django/mango/views.py	Mon Jun 23 17:29:47 2008
@@ -189,16 +189,24 @@
 
     filter = request.GET.get('filter_keyword', None)
     if filter:
-        mirrors = models.Ftpmirrors.objects.filter(Q(name__contains=filter) | Q(url__contains=filter))
+        queryset = models.Ftpmirrors.objects.filter(Q(name__contains=filter) | Q(url__contains=filter))
+
         filternode = ET.SubElement(ftpnodes, 'filter')
         keynode = ET.SubElement(filternode, 'keyword')
         keynode.text = filter
     else:
-        mirrors = models.Ftpmirrors.objects.all()
-    for mirror in mirrors:
+        queryset = models.Ftpmirrors.objects.all()
+
+    paginator = QuerySetPaginator(queryset, 25)
+    try:
+        page = paginator.page(request.GET.get('page', 1))
+    except InvalidPage:
+        raise Http404('Invalid page')
+    add_paginator_to_xml(ftpnodes, page)
+    for obj in page.object_list:
         ftpnode = ET.SubElement(ftpnodes, 'ftpmirror')
 
-        mirror.add_to_xml(ET, ftpnode)
+        obj.add_to_xml(ET, ftpnode)
 
     return get_xmlresponse(doc, "list_ftpmirrors.xsl")
 

Modified: branches/django/www/list_ftpmirrors.xsl
==============================================================================
--- branches/django/www/list_ftpmirrors.xsl	(original)
+++ branches/django/www/list_ftpmirrors.xsl	Mon Jun 23 17:29:47 2008
@@ -7,7 +7,7 @@
    
   <xsl:include href="common.xsl" />
 
-  <xsl:variable name="script" select="'list_ftpmirrors.php'"/>
+  <xsl:variable name="script" select="'.'"/>
 
   <xsl:template match="listftpmirrors">
    <xsl:apply-templates select="error"/>