Skip to content

Commit

Permalink
Fixed AttributeError thrown when deleting sofware versions or images …
Browse files Browse the repository at this point in the history
…from list views. (nautobot#5739)

* Fixed AttributeError thrown when deleting sofware versions or images from list views.

* Update changes/5669.fixed

Co-authored-by: Glenn Matthews <[email protected]>

* Update nautobot/core/views/utils.py

Co-authored-by: Glenn Matthews <[email protected]>

* address PR feedback

* address PR feedback

* fix unittests

---------

Co-authored-by: Glenn Matthews <[email protected]>
  • Loading branch information
HanlinMiao and glennmatthews authored May 22, 2024
1 parent a64066f commit 5f97da6
Show file tree
Hide file tree
Showing 3 changed files with 103 additions and 1 deletion.
1 change: 1 addition & 0 deletions changes/5669.fixed
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fixed AttributeError thrown when deleting software versions or images from list views.
19 changes: 18 additions & 1 deletion nautobot/core/views/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -215,11 +215,28 @@ def handle_protectederror(obj_list, request, e):
protected_count,
)

# Format objects based on whether they have a detail view/absolute url
objects_with_absolute_url = []
objects_without_absolute_url = []
# Append dependent objects to error message
for dependent in protected_objects[:50]:
try:
dependent.get_absolute_url()
objects_with_absolute_url.append(dependent)
except AttributeError:
objects_without_absolute_url.append(dependent)

err_message += format_html_join(
", ",
'<a href="{}">{}</a>',
((dependent.get_absolute_url(), dependent) for dependent in protected_objects[:50]),
((dependent.get_absolute_url(), dependent) for dependent in objects_with_absolute_url),
)
if objects_with_absolute_url and objects_without_absolute_url:
err_message += format_html(", ")
err_message += format_html_join(
", ",
"<span>{}</span>",
((dependent,) for dependent in objects_without_absolute_url),
)

messages.error(request, err_message)
Expand Down
84 changes: 84 additions & 0 deletions nautobot/dcim/tests/test_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -3398,6 +3398,48 @@ def setUpTestData(cls):
"download_url": "https://example.com/software_image_file_test_case.bin",
}

@override_settings(EXEMPT_VIEW_PERMISSIONS=["*"])
def test_correct_handling_for_model_protected_error(self):
platform = Platform.objects.first()
software_version_status = Status.objects.get_for_model(SoftwareVersion).first()
software_image_file_status = Status.objects.get_for_model(SoftwareImageFile).first()
software_version = SoftwareVersion.objects.create(
platform=platform, version="Test version 1.0.0", status=software_version_status
)
software_image_file = SoftwareImageFile.objects.create(
software_version=software_version,
image_file_name="software_image_file_qs_test_1.bin",
status=software_image_file_status,
)
device_type = DeviceType.objects.first()
device_role = Role.objects.get_for_model(Device).first()
device_status = Status.objects.get_for_model(Device).first()
location = Location.objects.filter(location_type__name="Campus").first()
Device.objects.create(
device_type=device_type,
role=device_role,
name="Device 1",
location=location,
status=device_status,
software_version=software_version,
)
device_type_to_software_image_file = DeviceTypeToSoftwareImageFile.objects.create(
device_type=device_type, software_image_file=software_image_file
)

self.add_permissions("dcim.delete_softwareimagefile")
pk_list = [software_image_file.pk]
data = {
"pk": pk_list,
"confirm": True,
"_confirm": True, # Form button
}
response = self.client.post(self._get_url("bulk_delete"), data, follow=True)
self.assertHttpStatus(response, 200)
response_body = response.content.decode(response.charset)
# Assert protected error message included in the response body
self.assertInHTML(f"<span>{device_type_to_software_image_file}</span>", response_body)


class SoftwareVersionTestCase(ViewTestCases.PrimaryObjectViewTestCase):
model = SoftwareVersion
Expand Down Expand Up @@ -3436,6 +3478,48 @@ def setUpTestData(cls):
"pre_release": True,
}

@override_settings(EXEMPT_VIEW_PERMISSIONS=["*"])
def test_correct_handling_for_model_protected_error(self):
platform = Platform.objects.first()
software_version_status = Status.objects.get_for_model(SoftwareVersion).first()
software_image_file_status = Status.objects.get_for_model(SoftwareImageFile).first()
software_version = SoftwareVersion.objects.create(
platform=platform, version="Test version 1.0.0", status=software_version_status
)
software_image_file = SoftwareImageFile.objects.create(
software_version=software_version,
image_file_name="software_image_file_qs_test_1.bin",
status=software_image_file_status,
)
device_type = DeviceType.objects.first()
device_role = Role.objects.get_for_model(Device).first()
device_status = Status.objects.get_for_model(Device).first()
location = Location.objects.filter(location_type__name="Campus").first()
Device.objects.create(
device_type=device_type,
role=device_role,
name="Device 1",
location=location,
status=device_status,
software_version=software_version,
)
device_type_to_software_image_file = DeviceTypeToSoftwareImageFile.objects.create(
device_type=device_type, software_image_file=software_image_file
)

self.add_permissions("dcim.delete_softwareversion")
pk_list = [software_version.pk]
data = {
"pk": pk_list,
"confirm": True,
"_confirm": True, # Form button
}
response = self.client.post(self._get_url("bulk_delete"), data, follow=True)
self.assertHttpStatus(response, 200)
response_body = response.content.decode(response.charset)
# Assert protected error message included in the response body
self.assertInHTML(f"<span>{device_type_to_software_image_file}</span>", response_body)


class ControllerTestCase(ViewTestCases.PrimaryObjectViewTestCase):
model = Controller
Expand Down

0 comments on commit 5f97da6

Please sign in to comment.