Merge lp:~rvb/maas/zone-listing-pagination into lp:~maas-committers/maas/trunk

[Raphaël Badin]

Fix zone listing: add pagination.

[Jeroen T. Vermeulen (jtv)]

I see you applied the comments from my other review here as well. That's why I put this one off for a while. :) Thanks.

The "Create 4 zones" comment probably makes a bit more sense here than the "Create 4 networks" one in the other branch. But when you add it to the two-line list comprehension, it's not much nicer than the loop it replaces... Maybe just put the list comprehension on a single line?

review: Approve

[Raphaël Badin (rvb)]

> I see you applied the comments from my other review here as well. That's why
> I put this one off for a while. :) Thanks.
>
> The "Create 4 zones" comment probably makes a bit more sense here than the
> "Create 4 networks" one in the other branch. But when you add it to the two-
> line list comprehension, it's not much nicer than the loop it replaces...
> Maybe just put the list comprehension on a single line?

Right, done.

Thanks for the review!

=== modified file 'src/maasserver/templates/maasserver/zone_list.html'
--- src/maasserver/templates/maasserver/zone_list.html	2014-02-07 14:30:24 +0000
+++ src/maasserver/templates/maasserver/zone_list.html	2014-03-25 12:43:54 +0000
@@ -65,6 +65,7 @@
           {% endfor %}
         </tbody>
       </table>
+      {% include "maasserver/pagination.html" %}
       {% if user.is_superuser %}
       <a class="button right space-top-small" href="{% url 'zone-add' %}">
         Add zone

=== modified file 'src/maasserver/views/tests/test_zones.py'
--- src/maasserver/views/tests/test_zones.py	2014-03-05 02:20:03 +0000
+++ src/maasserver/views/tests/test_zones.py	2014-03-25 12:43:54 +0000
@@ -30,7 +30,10 @@
     )
 from maasserver.testing.factory import factory
 from maasserver.testing.testcase import MAASServerTestCase
-from maasserver.views.zones import ZoneAdd
+from maasserver.views.zones import (
+    ZoneAdd,
+    ZoneListView,
+    )
 from testtools.matchers import (
     Contains,
     ContainsAll,
@@ -118,6 +121,18 @@
         add_link = reverse('zone-add')
         self.assertNotIn(add_link, get_content_links(response))
 
+    def test_zone_listing_is_paginated(self):
+        self.patch(ZoneListView, "paginate_by", 3)
+        self.client_log_in(as_admin=True)
+        # Create 4 zones.
+        [factory.make_zone() for _ in range(4)]
+        response = self.client.get(reverse('zone-list'))
+        self.assertEqual(httplib.OK, response.status_code)
+        doc = fromstring(response.content)
+        self.assertEqual(
+            1, len(doc.cssselect('div.pagination')),
+            "Couldn't find pagination tag.")
+
 
 class ZoneListingViewTestAdmin(MAASServerTestCase):