Ticket #4481: ticket4481-rev2.patch

django/contrib/databrowse/datastructures.py

@@ -7 +7 @@
 from django.utils import dateformat
 from django.utils.text import capfirst
 from django.utils.translation import get_date_formats
+from django.core.paginator import ObjectPaginator
 
 EMPTY_VALUE = '(None)'
 
 class EasyModel(object):
-    def __init__(self, site, model):
+    def __init__(self, site, model, paginate_by=100, page=0):
         self.site = site
         self.model = model
         self.model_list = site.registry.keys()
         self.verbose_name = model._meta.verbose_name
         self.verbose_name_plural = model._meta.verbose_name_plural
+        self.paginate_by = paginate_by
+        self.page = page
+        self.pagination = None
 
     def __repr__(self):
         return '<EasyModel for %s>' % self.model._meta.object_name
@@ -29 +33 @@
         return '%s%s/%s/' % (self.site.root_url, self.model._meta.app_label, self.model._meta.module_name)
 
     def objects(self, **kwargs):
-        for obj in self.model._default_manager.filter(**kwargs):
+        op = ObjectPaginator(self.model._default_manager.filter(**kwargs), self.paginate_by)
+        self.pagination = {
+            'hits' : op.hits,
+            'pages' : op.pages,
+            'has_next_page' : op.has_next_page(self.page),
+            'has_previous_page' : op.has_previous_page(self.page),
+            'first_on_page' : op.first_on_page(self.page),
+            'last_on_page' : op.last_on_page(self.page),
+            'next_page_url' : "%s?page=%d" % (self.url(), self.page+1),
+            'previous_page_url' : "%s?page=%d" % (self.url(), self.page-1),
+        }
+        for obj in op.get_page(self.page):
             yield EasyInstance(self, obj)
 
     def object_by_pk(self, pk):
@@ -85 +100 @@
         return '<EasyInstance for %s (%s)>' % (self.model.model._meta.object_name, self.instance._get_pk_val())
 
     def __str__(self):
-        val = str(self.instance)
-        if len(val) > 30:
-            return val[:30] + '...'
-        return val
+        return str(self.instance)
 
     def pk(self):
         return self.instance._get_pk_val()

django/contrib/databrowse/templatetags/databrowse.py

@@ +1 @@
+from django import template
+
+register = template.Library()
+
+def truncatechar(value, arg):
+    """
+    Truncates a string after a given number of chars  
+    Argument: Number of chars to truncate after
+    """
+    try:
+        length = int(arg)
+    except ValueError: # invalid literal for int()
+        return value # Fail silently.
+    if not isinstance(value, basestring):
+        value = str(value)
+    if (len(value) > length):
+        return value[:length] + "..."
+    else:
+        return value
+register.filter(truncatechar)
+ No newline at end of file

django/contrib/databrowse/templates/databrowse/model_detail.html

@@ -16 +16 @@
 {% endfor %}
 </ul>
 
+<div class="pagination">
+{% if model.pagination.has_previous_page %}
+    <a href="{{ model.pagination.previous_page_url }}" class="prev">&larr; Previous Page</a>
+{% endif %}
+{% if model.pagination.has_next_page %}
+    <a href="{{ model.pagination.next_page_url }}" class="next">Next Page &rarr;</a>
+{% endif %}
+</div>
 {% endblock %}

django/contrib/databrowse/templates/databrowse/homepage.html

@@ -1 +1 @@
 {% extends "databrowse/base.html" %}
+{% load databrowse %}
 
 {% block title %}Databrowse{% endblock %}
 
@@ -11 +12 @@
           <h2><a href="{{ model.url }}">{{ model.verbose_name_plural|capfirst }}</a></h2>
                 <p>
                 {% for object in model.sample_objects %}
-                        <a href="{{ object.url }}">{{ object }}</a>, 
+                        <a href="{{ object.url }}">{{ object|truncatechar:"30" }}</a>, 
                 {% endfor %}
                         <a class="more" href="{{ model.url }}">More &rarr;</a>
                 </p>

django/contrib/databrowse/templates/databrowse/base.html

@@ -47 +47 @@
 #header a:hover { text-decoration:underline; }
 /* CONTENT */
 #content { background:#fff; border-bottom:1px solid #ddd; padding:0 20px; }
+/* PAGINATION */
+.pagination { width: 50%; margin-left: auto; margin-right: auto; font-size: 1.4em; }
+.pagination a.prev { float: left; }
+.pagination a.next { float: right; }
 </style>
 </head>
 <body id="{% block bodyid %}page{% endblock %}">

django/contrib/databrowse/sites.py

@@ -59 +59 @@
         return plugin.model_view(request, self, rest_of_url)
 
     def main_view(self, request):
-        easy_model = EasyModel(self.site, self.model)
+        if "page" in request.GET:
+            page = int(request.GET['page'])
+        else:
+            page = 0
+        easy_model = EasyModel(self.site, self.model, page=page)
         html_snippets = '\n'.join([p.model_index_html(request, self.model, self.site) for p in self.plugins.values()])
         return render_to_response('databrowse/model_detail.html', {
             'model': easy_model,