NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-27 02:48:38 -06:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Revert object_views change and change to catch AbortRequest

Browse Source
This commit is contained in:
Daniel Sheppard 2024-12-17 19:56:08 -06:00
parent d4d4e5058b
commit b528804b34
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
netbox/dcim/models/cables.py
View File

@ -16,6 +16,7 @@ from dcim.fields import PathField
from dcim.utils import decompile_path_node, object_to_path_node from dcim.utils import decompile_path_node, object_to_path_node
from netbox.models import ChangeLoggedModel, PrimaryModel from netbox.models import ChangeLoggedModel, PrimaryModel
from utilities.conversion import to_meters from utilities.conversion import to_meters
from utilities.exceptions import AbortRequest
from utilities.fields import ColorField from utilities.fields import ColorField
from utilities.querysets import RestrictedQuerySet from utilities.querysets import RestrictedQuerySet
from wireless.models import WirelessLink from wireless.models import WirelessLink
@ -237,8 +238,10 @@ class Cable(PrimaryModel):
for termination in self.b_terminations: for termination in self.b_terminations:
if not termination.pk or termination not in b_terminations: if not termination.pk or termination not in b_terminations:
CableTermination(cable=self, cable_end='B', termination=termination).save() CableTermination(cable=self, cable_end='B', termination=termination).save()
try:
trace_paths.send(Cable, instance=self, created=_created) trace_paths.send(Cable, instance=self, created=_created)
except UnsupportedCablePath as e:
raise AbortRequest(e)
def get_status_color(self): def get_status_color(self):
return LinkStatusChoices.colors.get(self.status) return LinkStatusChoices.colors.get(self.status)
@ -533,7 +536,7 @@ class CablePath(models.Model):
# Ensure all originating terminations are attached to the same link # Ensure all originating terminations are attached to the same link
if len(terminations) > 1 and not all(t.link == terminations[0].link for t in terminations[1:]): if len(terminations) > 1 and not all(t.link == terminations[0].link for t in terminations[1:]):
raise UnsupportedCablePath(_("All originating terminations must start must be attached to the same link")) raise UnsupportedCablePath(_("All originating terminations must be attached to the same link"))
path = [] path = []
position_stack = [] position_stack = []

7
netbox/netbox/views/generic/object_views.py
View File

@ -13,7 +13,6 @@ from django.utils.html import escape
from django.utils.safestring import mark_safe from django.utils.safestring import mark_safe
from django.utils.translation import gettext as _ from django.utils.translation import gettext as _
from dcim.exceptions import UnsupportedCablePath
from extras.signals import clear_events from extras.signals import clear_events
from utilities.error_handlers import handle_protectederror from utilities.error_handlers import handle_protectederror
from utilities.exceptions import AbortRequest, PermissionsViolation from utilities.exceptions import AbortRequest, PermissionsViolation
@ -308,12 +307,6 @@ class ObjectEditView(GetReturnURLMixin, BaseObjectView):
form.add_error(None, e.message) form.add_error(None, e.message)
clear_events.send(sender=self) clear_events.send(sender=self)
# Catch any validation errors thrown in the model.save() or form.save() methods
except UnsupportedCablePath as e:
logger.debug(e.message)
form.add_error(None, e.message)
clear_events.send(sender=self)
else: else:
logger.debug("Form validation failed") logger.debug("Form validation failed")