mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Fixes #2470: Log the creation of device/VM components as object changes

Browse Source
This commit is contained in:
Jeremy Stretch
2018-09-28 16:04:51 -04:00
parent 2ee5b2344e
commit 020b5ea870
2 changed files with 10 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -13,6 +13,7 @@ v2.4.5 (FUTURE)
* [#2443](https://github.com/digitalocean/netbox/issues/2443) - Enforce JSON object format when creating config contexts * [#2443](https://github.com/digitalocean/netbox/issues/2443) - Enforce JSON object format when creating config contexts
* [#2444](https://github.com/digitalocean/netbox/issues/2444) - Improve validation of interface MAC addresses * [#2444](https://github.com/digitalocean/netbox/issues/2444) - Improve validation of interface MAC addresses
* [#2455](https://github.com/digitalocean/netbox/issues/2455) - Ignore unique address enforcement for IPs with a shared/virtual role * [#2455](https://github.com/digitalocean/netbox/issues/2455) - Ignore unique address enforcement for IPs with a shared/virtual role
* [#2470](https://github.com/digitalocean/netbox/issues/2470) - Log the creation of device/VM components as object changes
--- ---

29
netbox/utilities/views.py
View File

@ -713,19 +713,24 @@ class ComponentCreateView(View):
data = deepcopy(form.cleaned_data) data = deepcopy(form.cleaned_data)
for name in form.cleaned_data['name_pattern']: for name in form.cleaned_data['name_pattern']:
# Initialize data for the individual component form
component_data = { component_data = {
self.parent_field: parent.pk, self.parent_field: parent.pk,
'name': name, 'name': name,
} }
# Replace objects with their primary key to keep component_form.clean() happy # Replace objects with their primary key to keep component_form.clean() happy
for k, v in data.items(): for k, v in data.items():
if hasattr(v, 'pk'): if hasattr(v, 'pk'):
component_data[k] = v.pk component_data[k] = v.pk
else: else:
component_data[k] = v component_data[k] = v
component_form = self.model_form(component_data) component_form = self.model_form(component_data)
if component_form.is_valid(): if component_form.is_valid():
new_components.append(component_form.save(commit=False)) new_components.append(component_form)
else: else:
for field, errors in component_form.errors.as_data().items(): for field, errors in component_form.errors.as_data().items():
# Assign errors on the child form's name field to name_pattern on the parent form # Assign errors on the child form's name field to name_pattern on the parent form
@ -735,26 +740,10 @@ class ComponentCreateView(View):
form.add_error(field, '{}: {}'.format(name, ', '.join(e))) form.add_error(field, '{}: {}'.format(name, ', '.join(e)))
if not form.errors: if not form.errors:
self.model.objects.bulk_create(new_components)
# ManyToMany relations are bulk created via the through model # Create the new components
m2m_fields = [field for field in component_form.fields if type(component_form.fields[field]) in M2M_FIELD_TYPES] for component_form in new_components:
if m2m_fields: component_form.save()
for field in m2m_fields:
field_links = []
for new_component in new_components:
for related_obj in component_form.cleaned_data[field]:
# The through model columns are the id's of our M2M relation objects
through_kwargs = {}
new_component_column = new_component.__class__.__name__ + '_id'
related_obj_column = related_obj.__class__.__name__ + '_id'
through_kwargs.update({
new_component_column.lower(): new_component.id,
related_obj_column.lower(): related_obj.id
})
field_link = getattr(self.model, field).through(**through_kwargs)
field_links.append(field_link)
getattr(self.model, field).through.objects.bulk_create(field_links)
messages.success(request, "Added {} {} to {}.".format( messages.success(request, "Added {} {} to {}.".format(
len(new_components), self.model._meta.verbose_name_plural, parent len(new_components), self.model._meta.verbose_name_plural, parent