diff --git a/kobo/apps/audit_log/models.py b/kobo/apps/audit_log/models.py index 4b679135a8..800cc0dad9 100644 --- a/kobo/apps/audit_log/models.py +++ b/kobo/apps/audit_log/models.py @@ -358,10 +358,8 @@ def create_from_bulk_request(request): bulk_action_to_audit_action = { 'archive': AuditAction.ARCHIVE, 'unarchive': AuditAction.UNARCHIVE, - 'delete': AuditAction.DELETE, - 'undelete': AuditAction.UNDELETE, } - audit_action = bulk_action_to_audit_action[action] + audit_action = bulk_action_to_audit_action.get(action) if audit_action is None: return # Unsupported action diff --git a/kobo/apps/audit_log/tests/test_project_history_logs.py b/kobo/apps/audit_log/tests/test_project_history_logs.py index ed486c5d16..b3e9fbb02e 100644 --- a/kobo/apps/audit_log/tests/test_project_history_logs.py +++ b/kobo/apps/audit_log/tests/test_project_history_logs.py @@ -881,14 +881,13 @@ def test_export_v1_creates_log(self): self._check_common_metadata(log.metadata, PROJECT_HISTORY_LOG_PROJECT_SUBTYPE) self.assertEqual(log.object_id, self.asset.id) - @data( - ('archive', AuditAction.ARCHIVE), - ('unarchive', AuditAction.UNARCHIVE), - ('undelete', AuditAction.UNDELETE), - ('delete', AuditAction.DELETE), + @data( ('archive', AuditAction.ARCHIVE, False), + ('unarchive', AuditAction.UNARCHIVE, False), + ('undelete', AuditAction.UNDELETE, True), + ('delete', AuditAction.DELETE, True), ) @unpack - def test_bulk_actions(self, bulk_action, audit_action): + def test_bulk_actions(self, bulk_action, audit_action, should_ignore): assets = [Asset.objects.create( content={ 'survey': [ @@ -915,4 +914,7 @@ def test_bulk_actions(self, bulk_action, audit_action): project_hist_logs = ProjectHistoryLog.objects.filter( object_id__in=[asset.id for asset in assets], action=audit_action ) - self.assertEqual(project_hist_logs.count(), 2) + if not should_ignore: + self.assertEqual(project_hist_logs.count(), 2) + else: + self.assertEqual(project_hist_logs.count(), 0)