diff --git a/tailbone/views/master.py b/tailbone/views/master.py index 21a5e58f..cd167c38 100644 --- a/tailbone/views/master.py +++ b/tailbone/views/master.py @@ -343,7 +343,7 @@ class MasterView(View): return self.redirect(self.request.current_route_url(**kw)) # Stash some grid stats, for possible use when generating URLs. - if grid.paginated and hasattr(grid, 'pager'): + if grid.paginated and grid.pager is not None: self.first_visible_grid_index = grid.pager.first_item # return grid data only, if partial page was requested diff --git a/tests/grids/test_core.py b/tests/grids/test_core.py index 4d143c85..e52b0f63 100644 --- a/tests/grids/test_core.py +++ b/tests/grids/test_core.py @@ -341,7 +341,7 @@ class TestGrid(WebTestCase): # settings are loaded, applied, saved self.assertEqual(grid.sort_defaults, []) - self.assertFalse(hasattr(grid, 'active_sorters')) + self.assertIsNone(grid.active_sorters) self.request.GET = {'sort1key': 'name', 'sort1dir': 'desc'} grid.load_settings() self.assertEqual(grid.active_sorters, [{'key': 'name', 'dir': 'desc'}]) @@ -365,7 +365,7 @@ class TestGrid(WebTestCase): # with sort defaults grid = self.make_grid(model_class=model.Setting, sortable=True, sort_on_backend=True, sort_defaults='name') - self.assertFalse(hasattr(grid, 'active_sorters')) + self.assertIsNone(grid.active_sorters) grid.load_settings() self.assertEqual(grid.active_sorters, [{'key': 'name', 'dir': 'asc'}]) @@ -376,7 +376,7 @@ class TestGrid(WebTestCase): mod.SortInfo('name', 'asc'), mod.SortInfo('value', 'desc'), ] - self.assertFalse(hasattr(grid, 'active_sorters')) + self.assertIsNone(grid.active_sorters) grid.load_settings() self.assertEqual(grid.active_sorters, [{'key': 'name', 'dir': 'asc'}]) @@ -390,7 +390,7 @@ class TestGrid(WebTestCase): grid = self.make_grid(key='settings', model_class=model.Setting, sortable=True, sort_on_backend=True, paginated=True, paginate_on_backend=True) - self.assertFalse(hasattr(grid, 'active_sorters')) + self.assertIsNone(grid.active_sorters) grid.load_settings() self.assertEqual(grid.active_sorters, [{'key': 'name', 'dir': 'desc'}])