diff --git a/tailbone/grids/core.py b/tailbone/grids/core.py index 66705160..d686b355 100644 --- a/tailbone/grids/core.py +++ b/tailbone/grids/core.py @@ -72,7 +72,7 @@ class Grid(object): joiners={}, filterable=False, filters={}, use_byte_string_filters=False, sortable=False, sorters={}, default_sortkey=None, default_sortdir='asc', pageable=False, default_pagesize=20, default_page=1, - checkboxes=False, checked=None, main_actions=[], more_actions=[], + checkboxes=False, checked=None, main_actions=[], more_actions=[], delete_speedbump=False, **kwargs): self.key = key @@ -112,6 +112,7 @@ class Grid(object): self.checked = lambda item: False self.main_actions = main_actions or [] self.more_actions = more_actions or [] + self.delete_speedbump = delete_speedbump self._whgrid_kwargs = kwargs diff --git a/tailbone/templates/grids/grid.mako b/tailbone/templates/grids/grid.mako index 0b4c1d39..146fcab6 100644 --- a/tailbone/templates/grids/grid.mako +++ b/tailbone/templates/grids/grid.mako @@ -1,5 +1,5 @@ ## -*- coding: utf-8; -*- -
+
${grid.make_webhelpers_grid()}
diff --git a/tailbone/views/master.py b/tailbone/views/master.py index cbeba251..e57a6104 100644 --- a/tailbone/views/master.py +++ b/tailbone/views/master.py @@ -128,7 +128,7 @@ class MasterView(View): rows_creatable = False rows_editable = False rows_deletable = False - rows_deletable_speedbump = False + rows_deletable_speedbump = True rows_bulk_deletable = False rows_default_pagesize = 20 rows_downloadable_csv = False diff --git a/tailbone/views/purchasing/receiving.py b/tailbone/views/purchasing/receiving.py index 4bbf9cc2..88885ca4 100644 --- a/tailbone/views/purchasing/receiving.py +++ b/tailbone/views/purchasing/receiving.py @@ -260,9 +260,9 @@ class ReceivingBatchView(PurchasingBatchView): if batch.is_truck_dump_parent(): return True - # can never delete rows from truck dump child + # can always delete rows from truck dump child elif batch.is_truck_dump_child(): - return False + return True else: # okay, normal batch if batch.order_quantities_known: