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

Accept None as valid arg for Grid.set_filter()

Browse source 
i.e. to effectively remove the filter
This commit is contained in:
Lance Edgar 2017-11-11 09:52:11 -06:00
parent 152db68606
commit 2cba0ade84
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
tailbone/grids/core.py
View file

@ -124,7 +124,10 @@ class Grid(object):
self.sorters[key] = self.make_sorter(*args, **kwargs) self.sorters[key] = self.make_sorter(*args, **kwargs)
def set_filter(self, key, *args, **kwargs): def set_filter(self, key, *args, **kwargs):
self.filters[key] = self.make_filter(key, *args, **kwargs) if len(args) == 1 and args[0] is None:
self.filters.pop(key, None)
else:
self.filters[key] = self.make_filter(key, *args, **kwargs)
def set_label(self, key, label): def set_label(self, key, label):
self.labels[key] = label self.labels[key] = label

4
tailbone/views/batch/core.py
View file

@ -539,12 +539,12 @@ class BatchMasterView(MasterView):
self.handler.refresh_batch_status(batch) self.handler.refresh_batch_status(batch)
except Exception as error: except Exception as error:
session.rollback() session.rollback()
log.warning("batch pre-fill failed: {}".format(batch), exc_info=True) log.warning("batch population failed: %s", batch, exc_info=True)
session.close() session.close()
if progress: if progress:
progress.session.load() progress.session.load()
progress.session['error'] = True progress.session['error'] = True
progress.session['error_msg'] = "Batch pre-fill failed: {} {}".format(error.__class__.__name__, error) progress.session['error_msg'] = "Batch population failed: {} - {}".format(error.__class__.__name__, error)
progress.session.save() progress.session.save()
return return