From 8d99ad3099b057df8a1b3bad6196a47091d53bbf Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 17 Aug 2016 12:41:12 -0400 Subject: [PATCH] Corrected issue with duplicate queries --- netbox/extras/forms.py | 5 ++++- netbox/utilities/views.py | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/netbox/extras/forms.py b/netbox/extras/forms.py index 5c0e937af..fcb23c3f0 100644 --- a/netbox/extras/forms.py +++ b/netbox/extras/forms.py @@ -111,7 +111,10 @@ class CustomFieldBulkEditForm(forms.Form): super(CustomFieldBulkEditForm, self).__init__(*args, **kwargs) # Add all applicable CustomFields to the form + custom_fields = [] for name, field in get_custom_fields_for_model(self.obj_type, bulk_editing=True).items(): field.required = False self.fields[name] = field - self.custom_fields.append(name) + custom_fields.append(name) + + self.custom_fields = custom_fields diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py index 31485fc74..03b24c7ab 100644 --- a/netbox/utilities/views.py +++ b/netbox/utilities/views.py @@ -339,7 +339,8 @@ class BulkEditView(View): if form.cleaned_data[name] not in [None, u'']: for pk in pk_list: try: - cfv = CustomFieldValue.objects.get(field=form.fields[name].model, obj_type=obj_type, obj_id=pk) + cfv = CustomFieldValue.objects.select_related('field').get(field=form.fields[name].model, + obj_type=obj_type, obj_id=pk) except CustomFieldValue.DoesNotExist: cfv = CustomFieldValue(field=form.fields[name].model, obj_type=obj_type, obj_id=pk) cfv.value = form.cleaned_data[name]