From f2bc6f0f962bb16e3cf9317a1556c1719b116aa0 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 17 Nov 2020 16:25:20 -0500
Subject: [PATCH] Fixes #5355: Limit rack groups by selected site when editing
 a rack

---
 docs/release-notes/version-2.9.md | 1 +
 netbox/dcim/forms.py              | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/docs/release-notes/version-2.9.md b/docs/release-notes/version-2.9.md
index ebed19f20..336bb2fcd 100644
--- a/docs/release-notes/version-2.9.md
+++ b/docs/release-notes/version-2.9.md
@@ -11,6 +11,7 @@
 * [#5235](https://github.com/netbox-community/netbox/issues/5235) - Fix exception when editing IP address with a NAT IP assigned to a non-racked device
 * [#5345](https://github.com/netbox-community/netbox/issues/5345) - Fix non-deterministic ordering of prefixes and IP addresses
 * [#5350](https://github.com/netbox-community/netbox/issues/5350) - Filter available racks by selected group when creating a rack reservation
+* [#5355](https://github.com/netbox-community/netbox/issues/5355) - Limit rack groups by selected site when editing a rack
 
 ---
 
diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index 871e4672c..40f2564f4 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -470,6 +470,13 @@ class RackForm(BootstrapMixin, TenancyForm, CustomFieldModelForm):
             'region_id': '$region'
         }
     )
+    group = DynamicModelChoiceField(
+        queryset=RackGroup.objects.all(),
+        required=False,
+        query_params={
+            'site_id': '$site'
+        }
+    )
     role = DynamicModelChoiceField(
         queryset=RackRole.objects.all(),
         required=False