Skip to content

Commit cda8c21

Browse files
committed
Hide background_job field on lease delete form
1 parent b9f8a88 commit cda8c21

4 files changed

Lines changed: 19 additions & 5 deletions

File tree

netbox_kea/forms.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,9 +175,8 @@ def clean(self, value: Any) -> Any:
175175
class BaseLeaseDeleteForm(forms.Form):
176176
# NetBox v4.4 requires a background_job field for the bulk_delete.html
177177
# template.
178-
background_job = forms.CharField(
179-
required=False, widget=VeryHiddenInput, label="background_job"
180-
)
178+
# label="" so that the label is not rendered.
179+
background_job = forms.CharField(required=False, widget=VeryHiddenInput, label="")
181180
return_url = forms.CharField(
182181
required=False,
183182
widget=forms.HiddenInput(),
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{% extends "generic/bulk_delete.html" %}
2+
3+
{% block head %}
4+
{{ block.super }}
5+
<style type="text/css">
6+
#delete-form form div.bg-primary-subtle {
7+
display: none;
8+
}
9+
</style>
10+
11+
{% endblock %}

netbox_kea/views.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ def post(self, request: HttpRequest, **kwargs) -> HttpResponse:
442442
if "_confirm" not in request.POST:
443443
return render(
444444
request,
445-
"generic/bulk_delete.html",
445+
"netbox_kea/leases_bulk_delete.html",
446446
{
447447
"model": FakeLeaseModel,
448448
"table": tables.LeaseDeleteTable(

tests/test_ui.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1021,8 +1021,12 @@ def test_lease_delete(
10211021

10221022
url = page.url
10231023

1024+
page.get_by_role("alert").to_have_text(
1025+
"The following operation will delete 1 leases."
1026+
)
10241027
page.get_by_role("button", name="Delete Selected").click()
1025-
page.locator('button[name="_confirm"]').click()
1028+
expect(page.locator("#delete-form form div.bg-primary-subtle")).not_to_be_visible()
1029+
page.get_by_role("button", name="Delete 1 leases").click()
10261030
expect(page.locator(".toast-body")).to_have_text(
10271031
re.compile(f"Deleted 1 DHCPv{family} lease\\(s\\)")
10281032
)

0 commit comments

Comments
 (0)