NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-26 17:26:10 -06:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

11933 saved filters clone of content-types and add m2m field cloning

Browse Source
This commit is contained in:
Arthur 2023-03-20 15:04:56 -07:00
parent 8d25d7812c
commit 2fa87131cb
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/extras/models/models.py
View File

@ -406,7 +406,7 @@ class SavedFilter(CloningMixin, ExportTemplatesMixin, WebhooksMixin, ChangeLogge
parameters = models.JSONField()
clone_fields = (
'enabled', 'weight',
'content_types', 'weight', 'enabled', 'parameters',
)
class Meta:

11
netbox/netbox/models/features.py
View File

@ -110,9 +110,14 @@ class CloningMixin(models.Model):
for field_name in getattr(self, 'clone_fields', []):
field = self._meta.get_field(field_name)
field_value = field.value_from_object(self)
if field_value not in (None, ''):
attrs[field_name] = field_value
if isinstance(field, models.ManyToManyField):
m2m = getattr(self, field.name)
if m2m:
attrs[field_name] = [f.pk for f in m2m.all()]
else:
field_value = field.value_from_object(self)
if field_value not in (None, ''):
attrs[field_name] = field_value
# Include tags (if applicable)
if is_taggable(self):