NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-23 04:22:01 -06:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Corrected reporting of bulk edits to custom fields

Browse Source
This commit is contained in:
Jeremy Stretch 2016-08-23 12:47:44 -04:00
parent 25c46894b4
commit fcd4c9f7de
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
netbox/utilities/views.py
View File

@ -296,7 +296,9 @@ class BulkEditView(View):
# Update custom fields for objects # Update custom fields for objects
if custom_fields: 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: if updated_count:
msg = u'Updated {} {}'.format(updated_count, self.cls._meta.verbose_name_plural) 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): 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)
objs_updated = False
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'']:
@ -354,6 +358,10 @@ class BulkEditView(View):
for pk in create_list for pk in create_list
]) ])
objs_updated = True
return len(pk_list) if objs_updated else 0
class BulkDeleteView(View): class BulkDeleteView(View):
cls = None cls = None