rattail/tailbone
2
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

fix: small bugfixes per upstream changes

Browse source
This commit is contained in:
Lance Edgar 2025-09-06 12:09:39 -05:00
parent fcc90d25ac
commit 6f14bb0e88
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tailbone/views/master.py
View file

@ -343,7 +343,7 @@ class MasterView(View):
return self.redirect(self.request.current_route_url(**kw)) return self.redirect(self.request.current_route_url(**kw))
# Stash some grid stats, for possible use when generating URLs. # 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 self.first_visible_grid_index = grid.pager.first_item
# return grid data only, if partial page was requested # return grid data only, if partial page was requested

8
tests/grids/test_core.py
View file

@ -341,7 +341,7 @@ class TestGrid(WebTestCase):
# settings are loaded, applied, saved # settings are loaded, applied, saved
self.assertEqual(grid.sort_defaults, []) self.assertEqual(grid.sort_defaults, [])
self.assertFalse(hasattr(grid, 'active_sorters')) self.assertIsNone(grid.active_sorters)
self.request.GET = {'sort1key': 'name', 'sort1dir': 'desc'} self.request.GET = {'sort1key': 'name', 'sort1dir': 'desc'}
grid.load_settings() grid.load_settings()
self.assertEqual(grid.active_sorters, [{'key': 'name', 'dir': 'desc'}]) self.assertEqual(grid.active_sorters, [{'key': 'name', 'dir': 'desc'}])
@ -365,7 +365,7 @@ class TestGrid(WebTestCase):
# with sort defaults # with sort defaults
grid = self.make_grid(model_class=model.Setting, sortable=True, grid = self.make_grid(model_class=model.Setting, sortable=True,
sort_on_backend=True, sort_defaults='name') sort_on_backend=True, sort_defaults='name')
self.assertFalse(hasattr(grid, 'active_sorters')) self.assertIsNone(grid.active_sorters)
grid.load_settings() grid.load_settings()
self.assertEqual(grid.active_sorters, [{'key': 'name', 'dir': 'asc'}]) self.assertEqual(grid.active_sorters, [{'key': 'name', 'dir': 'asc'}])
@ -376,7 +376,7 @@ class TestGrid(WebTestCase):
mod.SortInfo('name', 'asc'), mod.SortInfo('name', 'asc'),
mod.SortInfo('value', 'desc'), mod.SortInfo('value', 'desc'),
] ]
self.assertFalse(hasattr(grid, 'active_sorters')) self.assertIsNone(grid.active_sorters)
grid.load_settings() grid.load_settings()
self.assertEqual(grid.active_sorters, [{'key': 'name', 'dir': 'asc'}]) 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, grid = self.make_grid(key='settings', model_class=model.Setting,
sortable=True, sort_on_backend=True, sortable=True, sort_on_backend=True,
paginated=True, paginate_on_backend=True) paginated=True, paginate_on_backend=True)
self.assertFalse(hasattr(grid, 'active_sorters')) self.assertIsNone(grid.active_sorters)
grid.load_settings() grid.load_settings()
self.assertEqual(grid.active_sorters, [{'key': 'name', 'dir': 'desc'}]) self.assertEqual(grid.active_sorters, [{'key': 'name', 'dir': 'desc'}])