Fixes

grid/__init__.py

@@ -34,7 +34,7 @@ def __init__(self, request, per_page = 50, queryset = None, order_by = None):
         order = self.request.GET.get("order", order_by)
 
         if meta:
-            if not queryset:
+            if queryset is None:
                 queryset = meta.model.objects
             sortable = getattr(meta, "sortable", ())
             nonsortable = getattr(meta, "nonsortable", ())            
@@ -67,4 +67,11 @@ def paginator(self):
 
     @property
     def columns(self):
-        return self._columns
+        return self._columns
+
+    @property
+    def url(self):
+        url = self.request.get_full_path()
+        if not self.request.GET:
+            url += "?"
+        return url

grid/templatetags/dict.py

@@ -11,5 +11,5 @@ def get(dict, key):
             return getattr(dict, key)
 
     return None
-        
-register.filter(get)
+
+register.filter(get)

grid/templatetags/request.py

@@ -0,0 +1,10 @@
+from django.template import Library
+
+register = Library()
+
+def page(qdict, value):
+    newd = qdict.copy()
+    newd["page"] = value
+    return newd.urlencode()
+
+register.filter(page)

templates/grid/object_list.html

@@ -1,39 +1,32 @@
-<div class="box">
-    {% if title %}
-    <div class="title">
-        <h5>{{ title }}</h5>
-    </div>
-    {% endif %}
-    <div class="table">
-        <table>
-            <thead>
-                <tr>
-                    {% for col in grid.columns %}
-                    <th>
-                        {% if col.sortable %}
-                        <a href="{{ grid.request.path }}?order={{ col.order }}&page={{ grid.page.number }}">{{ col.label }}</a>
-                        {% else %}
-                        {{ col.label }}
-                        {% endif %}
-                    </th>
-                    {% endfor %}
-                </tr>
-            </thead>
-            <tbody>
-                {% if grid.page.object_list %}
-                {% for row in grid.page.object_list %}
-                {% include row_template|default:"grid/row.html" %}
+<div class="table">
+    <table>
+        <thead>
+            <tr>
+                {% for col in grid.columns %}
+                <th>
+                    {% if col.sortable %}
+                    <a href="{{ grid.request.path }}?order={{ col.order }}&page={{ grid.page.number }}">{{ col.label }}</a>
+                    {% else %}
+                    {{ col.label }}
+                    {% endif %}
+                </th>
                 {% endfor %}
-                {% else %}
-                <tr>
-                    <td colspan="{{ grid.columns|length }}" align="center">Brak rekordów do wyświetlenia</td>
-                </tr>
-                {% endif %}
-            </tbody>
-        </table>
-
-        {% if grid.paginator.num_pages > 1 %}
-        {% include paginator_template|default:"grid/paginator.html" %}
-        {% endif %}
-    </div>
-</div>
+            </tr>
+        </thead>
+        <tbody>
+            {% if grid.page.object_list %}
+            {% for row in grid.page.object_list %}
+            {% include row_template|default:"grid/row.html" %}
+            {% endfor %}
+            {% else %}
+            <tr>
+                <td colspan="{{ grid.columns|length }}" align="center">Brak rekordów do wyświetlenia</td>
+            </tr>
+            {% endif %}
+        </tbody>
+    </table>
+
+    {% if grid.paginator.num_pages > 1 %}
+    {% include paginator_template|default:"grid/paginator.html" %}
+    {% endif %}
+</div>

templates/grid/paginator.html

@@ -1,21 +1,22 @@
+{% load request %}
 <div class="pagination pagination-left">
     <div class="results">
         <span>Wyniki od {{ grid.page.start_index }} do {{ grid.page.end_index }} z {{ grid.paginator.count }}</span>
     </div>
  <ul class="pager">
   {% if grid.page.has_previous %}
-   <li><a href="{{ request.path }}?order={{ request.GET.order }}&page={{grid.page.previous_page_number}}" title="Poprzednia">&laquo; Poprzednia</a></li>
+   <li><a href="{{ request.path }}?{{ request.GET|page:grid.page.previous_page_number }}" title="Poprzednia">&laquo; Poprzednia</a></li>
   {% endif %}
   {% for pagenum in grid.paginator.page_range %}
   {%  ifequal pagenum grid.page.number %}
    <li class="current">{{ pagenum }}</li>
   {%  else %}
-   <li><a href="{{ request.path }}?order={{ request.GET.order }}&page={{pagenum}}" title="Strona {{pagenum}}">{{pagenum}}</a></li>
+   <li><a href="{{ request.path }}?{{ request.GET|page:pagenum}}" title="Strona {{pagenum}}">{{pagenum}}</a></li>
   {%  endifequal %}
  {% endfor %}
 
  {% if grid.page.has_next %}
-  <li><a href="{{ request.path }}?order={{ request.GET.order }}&page={{grid.page.next_page_number}}" title="Kolejna">Kolejna &raquo;</a></li> 
+  <li><a href="{{ request.path }}?{{ request.GET|page:grid.page.next_page_number}}" title="Kolejna">Kolejna &raquo;</a></li> 
  {% endif %}
  </ul>
 </div>