Skip to content
This repository was archived by the owner on Jun 13, 2025. It is now read-only.

Commit 28f8d8b

Browse files
authored
Make delete confirmation more lightweight (#1289)
1 parent 795e37f commit 28f8d8b

File tree

3 files changed

+4
-32
lines changed

3 files changed

+4
-32
lines changed

codecov_auth/admin.py

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -645,18 +645,7 @@ def delete_model(self, request, obj) -> None:
645645
TaskService().delete_owner(ownerid=obj.ownerid)
646646

647647
def get_deleted_objects(self, objs, request):
648-
(
649-
deleted_objects,
650-
model_count,
651-
perms_needed,
652-
protected,
653-
) = super().get_deleted_objects(objs, request)
654-
655-
if request.user and request.user.is_superuser:
656-
perms_needed = set()
657-
658-
deleted_objects = ()
659-
return deleted_objects, model_count, perms_needed, protected
648+
return [], {}, set(), []
660649

661650
def save_related(self, request: HttpRequest, form, formsets, change: bool) -> None:
662651
if formsets:

codecov_auth/tests/test_admin.py

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -125,26 +125,6 @@ def test_delete_model(self, delete_mock):
125125
self.owner_admin.delete_model(MagicMock(), user_to_delete)
126126
delete_mock.assert_called_once_with(ownerid=ownerid)
127127

128-
@patch("codecov_auth.admin.admin.ModelAdmin.get_deleted_objects")
129-
def test_confirmation_deleted_objects(self, mocked_deleted_objs):
130-
user_to_delete = OwnerFactory(plan=DEFAULT_FREE_PLAN)
131-
deleted_objs = [
132-
'Owner: <a href="/admin/codecov_auth/owner/{}/change/">{};</a>'.format(
133-
user_to_delete.ownerid, user_to_delete
134-
)
135-
]
136-
mocked_deleted_objs.return_value = deleted_objs, {"owners": 1}, set(), []
137-
138-
(
139-
deleted_objects,
140-
model_count,
141-
perms_needed,
142-
protected,
143-
) = self.owner_admin.get_deleted_objects([user_to_delete], MagicMock())
144-
145-
mocked_deleted_objs.assert_called_once()
146-
assert deleted_objects == ()
147-
148128
@patch("codecov_auth.admin.admin.ModelAdmin.log_change")
149129
def test_prev_and_new_values_in_log_entry(self, mocked_super_log_change):
150130
owner = OwnerFactory(staff=True, plan=DEFAULT_FREE_PLAN)

core/admin.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,9 @@ def delete_queryset(self, request, queryset) -> None:
104104
def delete_model(self, request, obj) -> None:
105105
TaskService().flush_repo(repository_id=obj.repoid)
106106

107+
def get_deleted_objects(self, objs, request):
108+
return [], {}, set(), []
109+
107110

108111
@admin.register(Pull)
109112
class PullsAdmin(AdminMixin, admin.ModelAdmin):

0 commit comments

Comments
 (0)