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

Cache custom fields on instance prior to save()

Browse Source
This commit is contained in:
Jeremy Stretch
2020-08-17 11:08:14 -04:00
parent 4ee8e473eb
commit dd707c97af
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
netbox/extras/forms.py
View File

@ -29,6 +29,9 @@ class CustomFieldModelForm(forms.ModelForm):
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
if self.instance._cf is None:
self.instance._cf = {}
self._append_customfield_fields() self._append_customfield_fields()
def _append_customfield_fields(self): def _append_customfield_fields(self):
@ -48,9 +51,12 @@ class CustomFieldModelForm(forms.ModelForm):
field_name = 'cf_{}'.format(cf.name) field_name = 'cf_{}'.format(cf.name)
if self.instance.pk: if self.instance.pk:
self.fields[field_name] = cf.to_form_field(set_initial=False) self.fields[field_name] = cf.to_form_field(set_initial=False)
self.fields[field_name].initial = self.custom_field_values.get(cf.name) value = self.custom_field_values.get(cf.name)
self.fields[field_name].initial = value
self.instance._cf[cf.name] = value
else: else:
self.fields[field_name] = cf.to_form_field() self.fields[field_name] = cf.to_form_field()
self.instance._cf[cf.name] = self.fields[field_name].initial
# Annotate the field in the list of CustomField form fields # Annotate the field in the list of CustomField form fields
self.custom_fields.append(field_name) self.custom_fields.append(field_name)
@ -77,13 +83,18 @@ class CustomFieldModelForm(forms.ModelForm):
cfv.save() cfv.save()
def save(self, commit=True): def save(self, commit=True):
# Cache custom field values on object prior to save to ensure change logging
for cf_name in self.custom_fields:
self.instance._cf[cf_name[3:]] = self.cleaned_data.get(cf_name)
obj = super().save(commit) obj = super().save(commit)
# Handle custom fields the same way we do M2M fields # Handle custom fields the same way we do M2M fields
if commit: if commit:
self._save_custom_fields() self._save_custom_fields()
else: else:
self.save_custom_fields = self._save_custom_fields obj.save_custom_fields = self._save_custom_fields
return obj return obj

1
netbox/extras/models/customfields.py
View File

@ -1,4 +1,3 @@
import logging
from collections import OrderedDict from collections import OrderedDict
from datetime import date from datetime import date

4
netbox/extras/signals.py
View File

@ -25,10 +25,6 @@ def _handle_changed_object(request, sender, instance, **kwargs):
else: else:
return return
# Cache any custom field values to ensure they are captured during serialization
if hasattr(instance, 'cache_custom_fields'):
instance.cache_custom_fields()
# Record an ObjectChange if applicable # Record an ObjectChange if applicable
if hasattr(instance, 'to_objectchange'): if hasattr(instance, 'to_objectchange'):
objectchange = instance.to_objectchange(action) objectchange = instance.to_objectchange(action)