diff --git a/codecov_auth/admin.py b/codecov_auth/admin.py index 4699f8185c..9e1a738838 100644 --- a/codecov_auth/admin.py +++ b/codecov_auth/admin.py @@ -645,18 +645,7 @@ def delete_model(self, request, obj) -> None: TaskService().delete_owner(ownerid=obj.ownerid) def get_deleted_objects(self, objs, request): - ( - deleted_objects, - model_count, - perms_needed, - protected, - ) = super().get_deleted_objects(objs, request) - - if request.user and request.user.is_superuser: - perms_needed = set() - - deleted_objects = () - return deleted_objects, model_count, perms_needed, protected + return [], {}, set(), [] def save_related(self, request: HttpRequest, form, formsets, change: bool) -> None: if formsets: diff --git a/codecov_auth/tests/test_admin.py b/codecov_auth/tests/test_admin.py index 6b36c50027..fa89693bdf 100644 --- a/codecov_auth/tests/test_admin.py +++ b/codecov_auth/tests/test_admin.py @@ -125,26 +125,6 @@ def test_delete_model(self, delete_mock): self.owner_admin.delete_model(MagicMock(), user_to_delete) delete_mock.assert_called_once_with(ownerid=ownerid) - @patch("codecov_auth.admin.admin.ModelAdmin.get_deleted_objects") - def test_confirmation_deleted_objects(self, mocked_deleted_objs): - user_to_delete = OwnerFactory(plan=DEFAULT_FREE_PLAN) - deleted_objs = [ - 'Owner: {};'.format( - user_to_delete.ownerid, user_to_delete - ) - ] - mocked_deleted_objs.return_value = deleted_objs, {"owners": 1}, set(), [] - - ( - deleted_objects, - model_count, - perms_needed, - protected, - ) = self.owner_admin.get_deleted_objects([user_to_delete], MagicMock()) - - mocked_deleted_objs.assert_called_once() - assert deleted_objects == () - @patch("codecov_auth.admin.admin.ModelAdmin.log_change") def test_prev_and_new_values_in_log_entry(self, mocked_super_log_change): owner = OwnerFactory(staff=True, plan=DEFAULT_FREE_PLAN) diff --git a/core/admin.py b/core/admin.py index 2a1908e826..af7f526732 100644 --- a/core/admin.py +++ b/core/admin.py @@ -104,6 +104,9 @@ def delete_queryset(self, request, queryset) -> None: def delete_model(self, request, obj) -> None: TaskService().flush_repo(repository_id=obj.repoid) + def get_deleted_objects(self, objs, request): + return [], {}, set(), [] + @admin.register(Pull) class PullsAdmin(AdminMixin, admin.ModelAdmin):