From af6237e12ec144ea40498dadd071c919dec4ac92 Mon Sep 17 00:00:00 2001
From: jeremystretch <jstretch@ns1.com>
Date: Thu, 7 Oct 2021 13:57:00 -0400
Subject: [PATCH] Fixes #7479: Fix parent interface choices when bulk editing
 VM interfaces

---
 docs/release-notes/version-3.0.md                              | 1 +
 netbox/netbox/views/generic.py                                 | 2 ++
 netbox/templates/virtualization/virtualmachine/interfaces.html | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/release-notes/version-3.0.md b/docs/release-notes/version-3.0.md
index dbc04e3b5..015935884 100644
--- a/docs/release-notes/version-3.0.md
+++ b/docs/release-notes/version-3.0.md
@@ -12,6 +12,7 @@
 * [#7051](https://github.com/netbox-community/netbox/issues/7051) - Fix permissions evaluation and improve error handling for connected device REST API endpoint
 * [#7471](https://github.com/netbox-community/netbox/issues/7471) - Correct redirect URL when attaching images via "add another" button
 * [#7474](https://github.com/netbox-community/netbox/issues/7474) - Fix AttributeError exception when rendering a report or custom script
+* [#7479](https://github.com/netbox-community/netbox/issues/7479) - Fix parent interface choices when bulk editing VM interfaces
 
 ---
 
diff --git a/netbox/netbox/views/generic.py b/netbox/netbox/views/generic.py
index f9c121cc0..4baf2e0e9 100644
--- a/netbox/netbox/views/generic.py
+++ b/netbox/netbox/views/generic.py
@@ -877,6 +877,8 @@ class BulkEditView(GetReturnURLMixin, ObjectPermissionRequiredMixin, View):
                 initial_data['device'] = request.GET.get('device')
             elif 'device_type' in request.GET:
                 initial_data['device_type'] = request.GET.get('device_type')
+            elif 'virtual_machine' in request.GET:
+                initial_data['virtual_machine'] = request.GET.get('virtual_machine')
 
             form = self.form(model, initial=initial_data)
             restrict_form_fields(form, request.user)
diff --git a/netbox/templates/virtualization/virtualmachine/interfaces.html b/netbox/templates/virtualization/virtualmachine/interfaces.html
index 496b0a8a6..143c8c70b 100644
--- a/netbox/templates/virtualization/virtualmachine/interfaces.html
+++ b/netbox/templates/virtualization/virtualmachine/interfaces.html
@@ -13,7 +13,7 @@
             <button type="submit" name="_rename" formaction="{% url 'virtualization:vminterface_bulk_rename' %}?return_url={% url 'virtualization:virtualmachine_interfaces' pk=object.pk %}" class="btn btn-warning btn-sm">
                 <span class="mdi mdi-pencil" aria-hidden="true"></span> Rename
             </button>
-            <button type="submit" name="_edit" formaction="{% url 'virtualization:vminterface_bulk_edit' %}?virtualmachine={{ object.pk }}&return_url={% url 'virtualization:virtualmachine_interfaces' pk=object.pk %}" class="btn btn-warning btn-sm">
+            <button type="submit" name="_edit" formaction="{% url 'virtualization:vminterface_bulk_edit' %}?virtual_machine={{ object.pk }}&return_url={% url 'virtualization:virtualmachine_interfaces' pk=object.pk %}" class="btn btn-warning btn-sm">
                 <span class="mdi mdi-pencil" aria-hidden="true"></span> Edit
             </button>
         {% endif %}