diff --git a/docs/release-notes/version-2.6.md b/docs/release-notes/version-2.6.md
index 15f3f9c56..10faf363b 100644
--- a/docs/release-notes/version-2.6.md
+++ b/docs/release-notes/version-2.6.md
@@ -12,10 +12,12 @@
* [#3310](https://github.com/netbox-community/netbox/issues/3310) - Preselect site and rack when connecting cable
* [#3393](https://github.com/netbox-community/netbox/issues/3393) - Paginate the circuits at the provider details view
* [#3440](https://github.com/netbox-community/netbox/issues/3440) - Add total length to cable trace
+* [#3491](https://github.com/netbox-community/netbox/issues/3491) - Include content of response on webhook error
* [#3623](https://github.com/netbox-community/netbox/issues/3623) - Add word expansion during interface creation
* [#3668](https://github.com/netbox-community/netbox/issues/3668) - Search by DNS name when assigning IP address
* [#3851](https://github.com/netbox-community/netbox/issues/3851) - Allow passing initial data to custom script forms
* [#3891](https://github.com/netbox-community/netbox/issues/3891) - Add `local_context_data` filter for virtual machines
+* [#3902](https://github.com/netbox-community/netbox/issues/3902) - Relax the non-essential required fields when connecting cable to circuit or power feed
## Bug Fixes
@@ -29,6 +31,8 @@
* [#3872](https://github.com/netbox-community/netbox/issues/3872) - Paginate related IPs of an address
* [#3876](https://github.com/netbox-community/netbox/issues/3876) - Fixed min/max to ASN input field at the site creation page
* [#3882](https://github.com/netbox-community/netbox/issues/3882) - Fix filtering of devices by rack group
+* [#3898](https://github.com/netbox-community/netbox/issues/3898) - Fix deleted message being set to None for cable
+* [#3905](https://github.com/netbox-community/netbox/issues/3905) - Fix divide-by-zero on power feeds with low power values
---
diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index c3f2269e2..3db4d772e 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -739,7 +739,7 @@ class RackElevationFilterForm(RackFilterForm):
# Filter the rack field based on the site and group
self.fields['site'].widget.add_filter_for('id', 'site')
- self.fields['rack_group_id'].widget.add_filter_for('id', 'group_id')
+ self.fields['group_id'].widget.add_filter_for('id', 'group_id')
#
@@ -2821,6 +2821,7 @@ class ConnectCableToCircuitTerminationForm(BootstrapMixin, ChainedFieldsMixin, f
termination_b_provider = forms.ModelChoiceField(
queryset=Provider.objects.all(),
label='Provider',
+ required=False,
widget=APISelect(
api_url='/api/circuits/providers/',
filter_for={
@@ -2874,6 +2875,7 @@ class ConnectCableToPowerFeedForm(BootstrapMixin, ChainedFieldsMixin, forms.Mode
termination_b_site = forms.ModelChoiceField(
queryset=Site.objects.all(),
label='Site',
+ required=False,
widget=APISelect(
api_url='/api/dcim/sites/',
display_field='cid',
@@ -2905,6 +2907,7 @@ class ConnectCableToPowerFeedForm(BootstrapMixin, ChainedFieldsMixin, forms.Mode
('rack_group', 'termination_b_rackgroup'),
),
label='Power Panel',
+ required=False,
widget=APISelect(
api_url='/api/dcim/power-panels/',
filter_for={
diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py
index 69c3c3475..833fb483b 100644
--- a/netbox/dcim/models.py
+++ b/netbox/dcim/models.py
@@ -3027,15 +3027,14 @@ class Cable(ChangeLoggedModel):
('termination_b_type', 'termination_b_id'),
)
+ def __init__(self, *args, **kwargs):
+ super().__init__(*args, **kwargs)
+
+ # A copy of the PK to be used by __str__ in case the object is deleted
+ self._pk = self.pk
+
def __str__(self):
- if self.label:
- return self.label
-
- # Save a copy of the PK on the instance since it's nullified if .delete() is called
- if not hasattr(self, 'id_string'):
- self.id_string = '#{}'.format(self.pk)
-
- return self.id_string
+ return self.label or '#{}'.format(self._pk)
def get_absolute_url(self):
return reverse('dcim:cable', args=[self.pk])
@@ -3142,6 +3141,9 @@ class Cable(ChangeLoggedModel):
super().save(*args, **kwargs)
+ # Update the private pk used in __str__ in case this is a new object (i.e. just got its pk)
+ self._pk = self.pk
+
def to_csv(self):
return (
'{}.{}'.format(self.termination_a_type.app_label, self.termination_a_type.model),
diff --git a/netbox/dcim/tests/test_models.py b/netbox/dcim/tests/test_models.py
index 2b5bed283..eba81b136 100644
--- a/netbox/dcim/tests/test_models.py
+++ b/netbox/dcim/tests/test_models.py
@@ -325,9 +325,12 @@ class CableTestCase(TestCase):
def test_cable_deletion(self):
"""
- When a Cable is deleted, the `cable` field on its termination points must be nullified.
+ When a Cable is deleted, the `cable` field on its termination points must be nullified. The str() method
+ should still return the PK of the string even after being nullified.
"""
self.cable.delete()
+ self.assertIsNone(self.cable.pk)
+ self.assertNotEqual(str(self.cable), '#None')
interface1 = Interface.objects.get(pk=self.interface1.pk)
self.assertIsNone(interface1.cable)
interface2 = Interface.objects.get(pk=self.interface2.pk)
diff --git a/netbox/extras/webhooks_worker.py b/netbox/extras/webhooks_worker.py
index 9a637e852..d41d795c6 100644
--- a/netbox/extras/webhooks_worker.py
+++ b/netbox/extras/webhooks_worker.py
@@ -60,5 +60,5 @@ def process_webhook(webhook, data, model_name, event, timestamp, username, reque
return 'Status {} returned, webhook successfully processed.'.format(response.status_code)
else:
raise requests.exceptions.RequestException(
- "Status {} returned, webhook FAILED to process.".format(response.status_code)
+ "Status {} returned with content '{}', webhook FAILED to process.".format(response.status_code, response.content)
)
diff --git a/netbox/templates/dcim/powerfeed.html b/netbox/templates/dcim/powerfeed.html
index a8ab302eb..4e88f09c9 100644
--- a/netbox/templates/dcim/powerfeed.html
+++ b/netbox/templates/dcim/powerfeed.html
@@ -112,7 +112,9 @@
{% if utilization %}
|
{{ utilization.allocated }}VA / {{ powerfeed.available_power }}VA
- {% utilization_graph utilization.allocated|percentage:powerfeed.available_power %}
+ {% if powerfeed.available_power > 0 %}
+ {% utilization_graph utilization.allocated|percentage:powerfeed.available_power %}
+ {% endif %}
|
{% else %}
N/A |