From d2aa91502a5c3f943c3398179fb57f51493ed07d Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Thu, 25 Apr 2024 14:02:45 -0500 Subject: [PATCH] Allow deleting rows from executed batches requires a view to explicitly opt-in. and a separate permission is required for the user --- tailbone/views/batch/core.py | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/tailbone/views/batch/core.py b/tailbone/views/batch/core.py index 4df3d911..84ef451f 100644 --- a/tailbone/views/batch/core.py +++ b/tailbone/views/batch/core.py @@ -63,6 +63,7 @@ class BatchMasterView(MasterView): batch_handler_class = None has_rows = True rows_deletable = True + rows_deletable_if_executed = False rows_bulk_deletable = True rows_downloadable_csv = True rows_downloadable_xlsx = True @@ -700,11 +701,11 @@ class BatchMasterView(MasterView): view = lambda r, i: self.get_row_action_url('view', r) actions.append(self.make_action('view', icon='eye', url=view)) - # edit and delete are NOT allowed after execution, or if batch is "complete" - if not batch.executed and not batch.complete: + # edit and delete are NOT allowed if batch is "complete" + if not batch.complete: # edit action - if self.rows_editable and self.has_perm('edit_row'): + if self.rows_editable and not batch.executed and self.has_perm('edit_row'): actions.append(self.make_action('edit', icon='edit', url=self.row_edit_action_url)) @@ -1241,9 +1242,16 @@ class BatchMasterView(MasterView): return False batch = self.get_parent(row) - if batch.complete or batch.executed: + + if batch.complete: return False + if batch.executed: + if not self.rows_deletable_if_executed: + return False + if not self.has_perm('delete_row_if_executed'): + return False + return True def template_kwargs_view_row(self, **kwargs): @@ -1504,6 +1512,12 @@ class BatchMasterView(MasterView): config.add_tailbone_permission(permission_prefix, '{}.refresh'.format(permission_prefix), "Refresh data for {}".format(model_title)) + # delete row if executed + if cls.rows_deletable_if_executed: + config.add_tailbone_permission(permission_prefix, + f'{permission_prefix}.delete_row_if_executed', + "Delete rows after batch is executed") + # toggle complete config.add_route('{}.toggle_complete'.format(route_prefix), '{}/{{{}}}/toggle-complete'.format(url_prefix, model_key)) config.add_view(cls, attr='toggle_complete', route_name='{}.toggle_complete'.format(route_prefix),