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 api2

Browse Source 
Conflicts:
	netbox/dcim/api/serializers.py
	netbox/dcim/api/views.py
	netbox/dcim/filters.py
This commit is contained in:
Jeremy Stretch
2017-02-27 17:04:08 -05:00
parent f1518226bd c6970e1998
commit 8f42f59a80
20 changed files with 319 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
netbox/utilities/views.py
View File

@@ -307,11 +307,12 @@ class BulkAddView(View):
if form.is_valid():
# The first field will be used as the pattern
pattern_field = form.fields.keys()[0]
field_names = list(form.fields.keys())
pattern_field = field_names[0]
pattern = form.cleaned_data[pattern_field]
# All other fields will be copied as object attributes
kwargs = {k: form.cleaned_data[k] for k in form.fields.keys()[1:]}
kwargs = {k: form.cleaned_data[k] for k in field_names[1:]}
new_objs = []
try:
@@ -470,7 +471,9 @@ class BulkEditView(View):
return redirect(return_url)
else:
form = self.form(self.cls, initial={'pk': pk_list})
initial_data = request.POST.copy()
initial_data['pk'] = pk_list
form = self.form(self.cls, initial=initial_data)
selected_objects = self.cls.objects.filter(pk__in=pk_list)
if not selected_objects: