From 63093661640a8c14ac5a184cd9c5049452cdcbbc Mon Sep 17 00:00:00 2001
From: Ryan Gillespie <24619595+nopg@users.noreply.github.com>
Date: Wed, 12 Jun 2024 04:48:04 +0000
Subject: [PATCH] Fixes #15717: Allow VM with Site to Cluster without Site

---
 netbox/dcim/forms/model_forms.py           | 5 ++++-
 netbox/virtualization/forms/model_forms.py | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/netbox/dcim/forms/model_forms.py b/netbox/dcim/forms/model_forms.py
index d5cc0e856..c12ddccde 100644
--- a/netbox/dcim/forms/model_forms.py
+++ b/netbox/dcim/forms/model_forms.py
@@ -465,7 +465,10 @@ class DeviceForm(TenancyForm, NetBoxModelForm):
         label=_('Cluster'),
         queryset=Cluster.objects.all(),
         required=False,
-        selector=True
+        selector=True,
+        query_params={
+            'site_id': ['$site', 'null']
+        },
     )
     comments = CommentField()
     local_context_data = JSONField(
diff --git a/netbox/virtualization/forms/model_forms.py b/netbox/virtualization/forms/model_forms.py
index f91dae79a..5ea8a4614 100644
--- a/netbox/virtualization/forms/model_forms.py
+++ b/netbox/virtualization/forms/model_forms.py
@@ -177,6 +177,9 @@ class VirtualMachineForm(TenancyForm, NetBoxModelForm):
         queryset=Cluster.objects.all(),
         required=False,
         selector=True,
+        query_params={
+            'site_id': ['$site', 'null']
+        },
     )
     device = DynamicModelChoiceField(
         label=_('Device'),