NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-16 04:02:52 -06:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Merge pull request #4719 from netbox-community/4715-avoid-unnecessary-queries

Browse Source 
Fixes #4715: Avoid unnecessary queries in Cable.from_db
This commit is contained in:
Jeremy Stretch 2020-06-04 13:13:17 -04:00 committed by GitHub
commit d2dce6db25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
netbox/dcim/models/__init__.py
View File

@ -2115,9 +2115,9 @@ class Cable(ChangeLoggedModel):
""" """
instance = super().from_db(db, field_names, values) instance = super().from_db(db, field_names, values)
instance._orig_termination_a_type = instance.termination_a_type instance._orig_termination_a_type_id = instance.termination_a_type_id
instance._orig_termination_a_id = instance.termination_a_id instance._orig_termination_a_id = instance.termination_a_id
instance._orig_termination_b_type = instance.termination_b_type instance._orig_termination_b_type_id = instance.termination_b_type_id
instance._orig_termination_b_id = instance.termination_b_id instance._orig_termination_b_id = instance.termination_b_id
return instance return instance
@ -2154,14 +2154,14 @@ class Cable(ChangeLoggedModel):
if self.pk: if self.pk:
err_msg = 'Cable termination points may not be modified. Delete and recreate the cable instead.' err_msg = 'Cable termination points may not be modified. Delete and recreate the cable instead.'
if ( if (
self.termination_a_type != self._orig_termination_a_type or self.termination_a_type_id != self._orig_termination_a_type_id or
self.termination_a_id != self._orig_termination_a_id self.termination_a_id != self._orig_termination_a_id
): ):
raise ValidationError({ raise ValidationError({
'termination_a': err_msg 'termination_a': err_msg
}) })
if ( if (
self.termination_b_type != self._orig_termination_b_type or self.termination_b_type_id != self._orig_termination_b_type_id or
self.termination_b_id != self._orig_termination_b_id self.termination_b_id != self._orig_termination_b_id
): ):
raise ValidationError({ raise ValidationError({