lance/edbob
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add join_map to grid views

Browse source
This commit is contained in:
Lance Edgar 2012-07-09 13:55:59 -05:00
parent f5054c58be
commit 288035b294
1 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
edbob/pyramid/views/grid.py
View file

@ -53,6 +53,9 @@ class Grid(object):
def __init__(self, request): def __init__(self, request):
self.request = request self.request = request
def join_map(self):
return {}
def make_filter_map(self, **kwargs): def make_filter_map(self, **kwargs):
return filters.get_filter_map(self.mapped_class, **kwargs) return filters.get_filter_map(self.mapped_class, **kwargs)
@ -69,8 +72,8 @@ class Grid(object):
def search_form(self, config): def search_form(self, config):
return filters.get_search_form(config) return filters.get_search_form(config)
def make_sort_map(self, *args): def make_sort_map(self, *args, **kwargs):
return grids.get_sort_map(self.mapped_class, names=args or None) return grids.get_sort_map(self.mapped_class, names=args or None, **kwargs)
def sort_map(self): def sort_map(self):
return self.make_sort_map() return self.make_sort_map()
@ -83,11 +86,13 @@ class Grid(object):
def grid_config(self, search, fmap): def grid_config(self, search, fmap):
return self.make_grid_config(search, fmap) return self.make_grid_config(search, fmap)
def make_query(self, config): def make_query(self, config, jmap=None):
if jmap is None:
jmap = self.join_map()
smap = self.sort_map() smap = self.sort_map()
q = Session.query(self.mapped_class) q = Session.query(self.mapped_class)
q = filters.filter_query(q, config) q = filters.filter_query(q, config, jmap)
q = grids.sort_query(q, config, smap) q = grids.sort_query(q, config, smap, jmap)
return q return q
def query(self, config): def query(self, config):
@ -111,6 +116,9 @@ class Grid(object):
return g return g
def __call__(self): def __call__(self):
"""
View callable method.
"""
fmap = self.filter_map() fmap = self.filter_map()
config = self.search_config(fmap) config = self.search_config(fmap)