fix: move "searchable columns" grid feature to wuttaweb
This commit is contained in:
parent
1d00fe994a
commit
ffa724ef37
3 changed files with 15 additions and 16 deletions
|
@ -200,7 +200,6 @@ class Grid(WuttaGrid):
|
|||
filterable=False,
|
||||
filters={},
|
||||
use_byte_string_filters=False,
|
||||
searchable={},
|
||||
checkboxes=False,
|
||||
checked=None,
|
||||
check_handler=None,
|
||||
|
@ -254,6 +253,12 @@ class Grid(WuttaGrid):
|
|||
DeprecationWarning, stacklevel=2)
|
||||
kwargs.setdefault('page', kwargs.pop('default_page'))
|
||||
|
||||
if 'searchable' in kwargs:
|
||||
warnings.warn("searchable param is deprecated for Grid(); "
|
||||
"please use searchable_columns param instead",
|
||||
DeprecationWarning, stacklevel=2)
|
||||
kwargs.setdefault('searchable_columns', kwargs.pop('searchable'))
|
||||
|
||||
# TODO: this should not be needed once all templates correctly
|
||||
# reference grid.vue_component etc.
|
||||
kwargs.setdefault('vue_tagname', 'tailbone-grid')
|
||||
|
@ -287,8 +292,6 @@ class Grid(WuttaGrid):
|
|||
self.use_byte_string_filters = use_byte_string_filters
|
||||
self.filters = self.make_filters(filters)
|
||||
|
||||
self.searchable = searchable or {}
|
||||
|
||||
self.checkboxes = checkboxes
|
||||
self.checked = checked
|
||||
if self.checked is None:
|
||||
|
@ -481,15 +484,6 @@ class Grid(WuttaGrid):
|
|||
kwargs['label'] = self.labels[key]
|
||||
self.filters[key] = self.make_filter(key, *args, **kwargs)
|
||||
|
||||
def set_searchable(self, key, searchable=True):
|
||||
if searchable:
|
||||
self.searchable[key] = True
|
||||
else:
|
||||
self.searchable.pop(key, None)
|
||||
|
||||
def is_searchable(self, key):
|
||||
return self.searchable.get(key, False)
|
||||
|
||||
def remove_filter(self, key):
|
||||
self.filters.pop(key, None)
|
||||
|
||||
|
@ -1587,6 +1581,7 @@ class Grid(WuttaGrid):
|
|||
'field': name,
|
||||
'label': self.get_label(name),
|
||||
'sortable': self.is_sortable(name),
|
||||
'searchable': self.is_searchable(name),
|
||||
'visible': name not in self.invisible,
|
||||
})
|
||||
return columns
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue