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

Merge branch 'develop' into develop-2.8

Browse Source
This commit is contained in:
Jeremy Stretch
2020-03-10 15:06:37 -04:00
parent 803287a514 55558cb272
commit 0de857bf7a
156 changed files with 1561 additions and 1674 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
netbox/utilities/views.py
View File

@@ -566,7 +566,7 @@ class BulkImportView(GetReturnURLMixin, View):
return ImportForm(*args, **kwargs)
def _save_obj(self, obj_form):
def _save_obj(self, obj_form, request):
"""
Provide a hook to modify the object immediately before saving it (e.g. to encrypt secret data).
"""
@@ -595,7 +595,7 @@ class BulkImportView(GetReturnURLMixin, View):
for row, data in enumerate(form.cleaned_data['csv'], start=1):
obj_form = self.model_form(data)
if obj_form.is_valid():
obj = self._save_obj(obj_form)
obj = self._save_obj(obj_form, request)
new_objs.append(obj)
else:
for field, err in obj_form.errors.items():