remove redundant 'python:' definitions. add pagination tests

Author: lenadax

src/cone/app/browser/templates/batched_items_footer.pt

@@ -9,10 +9,10 @@
     <div class="batched_items_info float-start"
          tal:define="slice context.current_slice">
       <span i18n:translate="showing">Showing</span>
-      <span tal:content="python: min(slice[0] + 1, context.item_count)"
+      <span tal:content="min(slice[0] + 1, context.item_count)"
             class="badge bg-primary">1</span>
       <span i18n:translate="to">to</span>
-      <span tal:content="python: min(slice[1], context.item_count)"
+      <span tal:content="min(slice[1], context.item_count)"
             class="badge bg-primary">10</span>
       <span i18n:translate="of">of</span>
       <span tal:content="context.item_count"

src/cone/app/browser/templates/table.pt

@@ -187,10 +187,10 @@
       <div class="table_info"
            tal:define="slice context.slice.slice">
         <span i18n:translate="showing">Showing</span>
-        <span tal:content="python: min(slice[0] + 1, context.item_count)"
+        <span tal:content="min(slice[0] + 1, context.item_count)"
               class="badge bg-primary">1</span>
         <span i18n:translate="to">to</span>
-        <span tal:content="python: min(slice[1], context.item_count)"
+        <span tal:content="min(slice[1], context.item_count)"
               class="badge bg-primary">10</span>
         <span i18n:translate="of">of</span>
         <span tal:content="context.item_count"

src/cone/app/tests/test_browser_batch.py

@@ -893,3 +893,55 @@ def filtered_items(self):
         batched_items.display_footer = False
         rendered = batched_items(model=model, request=self.layer.new_request())
         self.assertFalse(rendered.find(expected) > -1)
+
+    def test_footer_pagination(self):
+        # The batched_items footer displays "Showing X to Y of Z entries".
+        class MyBatchedItems(BatchedItems):
+            slice_template = 'cone.app.testing:dummy_batched_items.pt'
+            _items = []
+
+            @property
+            def item_count(self):
+                return len(self._items)
+
+            @property
+            def slice_items(self):
+                start, end = self.current_slice
+                return self._items[start:end]
+
+        def footer_html(batched_items):
+            footer = batched_items.rendered_footer
+            start = footer.find('batched_items_info')
+            end = footer.find('</div>', start)
+            return footer[start:end]
+
+        # Empty list: from=0, to=0, total=0.
+        batched_items = MyBatchedItems()
+        batched_items.model = BaseNode()
+        batched_items.request = self.layer.new_request()
+        batched_items._items = []
+        footer = footer_html(batched_items)
+        self.assertIn('>0<', footer)
+
+        # Full first page: from=1, to=15, total=20.
+        items = [BaseNode() for _ in range(20)]
+        batched_items = MyBatchedItems()
+        batched_items.model = BaseNode()
+        batched_items.request = self.layer.new_request()
+        batched_items._items = items
+        footer = footer_html(batched_items)
+        self.assertIn('>1<', footer)
+        self.assertIn('>15<', footer)
+        self.assertIn('>20<', footer)
+
+        # Partial last page: from=16, to=17, total=17.
+        items = [BaseNode() for _ in range(17)]
+        request = self.layer.new_request()
+        request.params['b_page'] = '1'
+        batched_items = MyBatchedItems()
+        batched_items.model = BaseNode()
+        batched_items.request = request
+        batched_items._items = items
+        footer = footer_html(batched_items)
+        self.assertIn('>16<', footer)
+        self.assertIn('>17<', footer)

src/cone/app/tests/test_browser_table.py

@@ -233,3 +233,58 @@ def sorted_rows(self, start, end, sort, order):
         # Datetime
         expected = '01.04.2011 00:00'
         self.assertTrue(rendered.find(expected) > -1)
+
+    def test_footer_pagination(self):
+        # The table footer displays "Showing X to Y of Z entries".
+        class MyTable(Table):
+            col_defs = [{
+                'id': 'col',
+                'title': 'Col',
+                'sort_key': None,
+                'sort_title': None,
+                'content': 'string',
+            }]
+            _count = 0
+
+            @property
+            def item_count(self):
+                return self._count
+
+            def sorted_rows(self, start, end, sort, order):
+                rows = []
+                for i in range(self._count):
+                    row_data = RowData()
+                    row_data['col'] = str(i)
+                    rows.append(row_data)
+                return rows[start:end]
+
+        tmpl = 'cone.app:browser/templates/table.pt'
+        model = BaseNode()
+        request = self.layer.new_request()
+
+        def footer_html(rendered):
+            start = rendered.find('table_info')
+            end = rendered.find('</div>', start)
+            return rendered[start:end]
+
+        # Empty table: from=0, to=0, total=0.
+        table = MyTable(tmpl, None, 'table')
+        table._count = 0
+        footer = footer_html(table(model, request))
+        self.assertIn('>0<', footer)
+
+        # Full first page: from=1, to=15, total=20.
+        table = MyTable(tmpl, None, 'table')
+        table._count = 20
+        footer = footer_html(table(model, request))
+        self.assertIn('>1<', footer)
+        self.assertIn('>15<', footer)
+        self.assertIn('>20<', footer)
+
+        # Partial last page: from=16, to=17, total=17.
+        table = MyTable(tmpl, None, 'table')
+        table._count = 17
+        request.params['b_page'] = '1'
+        footer = footer_html(table(model, request))
+        self.assertIn('>16<', footer)
+        self.assertIn('>17<', footer)