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

Optimized bulk editing of custom fields

Browse Source
This commit is contained in:
Jeremy Stretch
2016-08-17 15:52:27 -04:00
parent a33e89fed7
commit 9bdb50c33e
3 changed files with 35 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
netbox/extras/forms.py
View File

@ -81,18 +81,19 @@ class CustomFieldForm(forms.ModelForm):
def _save_custom_fields(self): def _save_custom_fields(self):
for field_name in self.custom_fields: for field_name in self.custom_fields:
try: if self.cleaned_data[field_name] not in [None, u'']:
cfv = CustomFieldValue.objects.select_related('field').get(field=self.fields[field_name].model, try:
obj_type=self.obj_type, cfv = CustomFieldValue.objects.select_related('field').get(field=self.fields[field_name].model,
obj_id=self.instance.pk) obj_type=self.obj_type,
except CustomFieldValue.DoesNotExist: obj_id=self.instance.pk)
cfv = CustomFieldValue( except CustomFieldValue.DoesNotExist:
field=self.fields[field_name].model, cfv = CustomFieldValue(
obj_type=self.obj_type, field=self.fields[field_name].model,
obj_id=self.instance.pk obj_type=self.obj_type,
) obj_id=self.instance.pk
cfv.value = self.cleaned_data[field_name] )
cfv.save() cfv.value = self.cleaned_data[field_name]
cfv.save()
def save(self, commit=True): def save(self, commit=True):
obj = super(CustomFieldForm, self).save(commit) obj = super(CustomFieldForm, self).save(commit)

6
netbox/extras/models.py
View File

@ -155,9 +155,9 @@ class CustomFieldValue(models.Model):
self.serialized_value = self.field.serialize_value(value) self.serialized_value = self.field.serialize_value(value)
def save(self, *args, **kwargs): def save(self, *args, **kwargs):
if (self.field.type == CF_TYPE_TEXT and self.value == '') or self.value is None: # Delete this object if it no longer has a value to store
if self.pk: if self.pk and self.value is None:
self.delete() self.delete()
else: else:
super(CustomFieldValue, self).save(*args, **kwargs) super(CustomFieldValue, self).save(*args, **kwargs)

30
netbox/utilities/views.py
View File

@ -277,9 +277,9 @@ class BulkEditView(View):
redirect_url = reverse(self.default_redirect_url) redirect_url = reverse(self.default_redirect_url)
if request.POST.get('_all'): if request.POST.get('_all'):
pk_list = [x for x in request.POST.get('pk_all').split(',') if x] pk_list = [int(pk) for pk in request.POST.get('pk_all').split(',') if pk]
else: else:
pk_list = request.POST.getlist('pk') pk_list = [int(pk) for pk in request.POST.getlist('pk')]
if '_apply' in request.POST: if '_apply' in request.POST:
if hasattr(self.form, 'custom_fields'): if hasattr(self.form, 'custom_fields'):
@ -334,17 +334,25 @@ class BulkEditView(View):
def update_custom_fields(self, pk_list, form, fields): def update_custom_fields(self, pk_list, form, fields):
obj_type = ContentType.objects.get_for_model(self.cls) obj_type = ContentType.objects.get_for_model(self.cls)
for name in fields: for name in fields:
if form.cleaned_data[name] not in [None, u'']: if form.cleaned_data[name] not in [None, u'']:
for pk in pk_list:
try: field = form.fields[name].model
cfv = CustomFieldValue.objects.select_related('field').get(field=form.fields[name].model, serialized_value = field.serialize_value(form.cleaned_data[name])
obj_type=obj_type, obj_id=pk) existing_cfvs = CustomFieldValue.objects.filter(field=field, obj_type=obj_type, obj_id__in=pk_list)
except CustomFieldValue.DoesNotExist:
cfv = CustomFieldValue(field=form.fields[name].model, obj_type=obj_type, obj_id=pk) # Determine which objects have an existing CFV to update and which need a new CFV created.
cfv.value = form.cleaned_data[name] update_list = [cfv['obj_id'] for cfv in existing_cfvs.values()]
cfv.save() create_list = list(set(pk_list) - set(update_list))
# Update any existing CFVs.
existing_cfvs.update(serialized_value=serialized_value)
# Create new CFVs as needed.
CustomFieldValue.objects.bulk_create([
CustomFieldValue(field=field, obj_type=obj_type, obj_id=pk, serialized_value=serialized_value)
for pk in create_list
])
class BulkDeleteView(View): class BulkDeleteView(View):