From fcd4c9f7de4b1447a21646bb9da2c2b428d6b052 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 23 Aug 2016 12:47:44 -0400 Subject: [PATCH] Corrected reporting of bulk edits to custom fields --- netbox/utilities/views.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/netbox/utilities/views.py b/netbox/utilities/views.py index 19643e664..674a33d22 100644 --- a/netbox/utilities/views.py +++ b/netbox/utilities/views.py @@ -296,7 +296,9 @@ class BulkEditView(View): # Update custom fields for objects if custom_fields: - self.update_custom_fields(pk_list, form, custom_fields) + objs_updated = self.update_custom_fields(pk_list, form, custom_fields) + if objs_updated and not updated_count: + updated_count = objs_updated if updated_count: msg = u'Updated {} {}'.format(updated_count, self.cls._meta.verbose_name_plural) @@ -334,6 +336,8 @@ class BulkEditView(View): def update_custom_fields(self, pk_list, form, fields): obj_type = ContentType.objects.get_for_model(self.cls) + objs_updated = False + for name in fields: if form.cleaned_data[name] not in [None, u'']: @@ -354,6 +358,10 @@ class BulkEditView(View): for pk in create_list ]) + objs_updated = True + + return len(pk_list) if objs_updated else 0 + class BulkDeleteView(View): cls = None