From 110a6d11a53c8da2c09abbf7c81dcc354afa4142 Mon Sep 17 00:00:00 2001
From: jeremystretch <jstretch@ns1.com>
Date: Fri, 28 May 2021 09:09:59 -0400
Subject: [PATCH] Closes #6487: Add location filter to cable connection form

---
 docs/release-notes/version-2.11.md       |  1 +
 netbox/dcim/forms.py                     | 12 +++++++++++-
 netbox/templates/dcim/cable_connect.html | 12 +++++++++---
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/docs/release-notes/version-2.11.md b/docs/release-notes/version-2.11.md
index 63cc60b86..b9b86ef91 100644
--- a/docs/release-notes/version-2.11.md
+++ b/docs/release-notes/version-2.11.md
@@ -5,6 +5,7 @@
 ### Enhancements
 
 * [#6087](https://github.com/netbox-community/netbox/issues/6087) - Improved prefix hierarchy rendering
+* [#6487](https://github.com/netbox-community/netbox/issues/6487) - Add location filter to cable connection form
 * [#6501](https://github.com/netbox-community/netbox/issues/6501) - Expose prefix depth and children on REST API serializer
 
 ---
diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index efb712963..c9c7c86a6 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -3923,13 +3923,23 @@ class ConnectCableToDeviceForm(BootstrapMixin, CustomFieldModelForm):
             'group_id': '$termination_b_site_group',
         }
     )
+    termination_b_location = DynamicModelChoiceField(
+        queryset=Location.objects.all(),
+        label='Location',
+        required=False,
+        null_option='None',
+        query_params={
+            'site_id': '$termination_b_site'
+        }
+    )
     termination_b_rack = DynamicModelChoiceField(
         queryset=Rack.objects.all(),
         label='Rack',
         required=False,
         null_option='None',
         query_params={
-            'site_id': '$termination_b_site'
+            'site_id': '$termination_b_site',
+            'location_id': '$termination_b_location',
         }
     )
     termination_b_device = DynamicModelChoiceField(
diff --git a/netbox/templates/dcim/cable_connect.html b/netbox/templates/dcim/cable_connect.html
index 3215bc8e9..9556e1117 100644
--- a/netbox/templates/dcim/cable_connect.html
+++ b/netbox/templates/dcim/cable_connect.html
@@ -35,13 +35,13 @@
                             <div class="form-group">
                                 <label class="col-md-3 control-label required">Region</label>
                                 <div class="col-md-9">
-                                    <p class="form-control-static">{{ termination_a.device.site.region }}</p>
+                                    <p class="form-control-static">{{ termination_a.device.site.region|placeholder }}</p>
                                 </div>
                             </div>
                             <div class="form-group">
                                 <label class="col-md-3 control-label required">Site Group</label>
                                 <div class="col-md-9">
-                                    <p class="form-control-static">{{ termination_a.device.site.group }}</p>
+                                    <p class="form-control-static">{{ termination_a.device.site.group|placeholder }}</p>
                                 </div>
                             </div>
                             <div class="form-group">
@@ -50,10 +50,16 @@
                                     <p class="form-control-static">{{ termination_a.device.site }}</p>
                                 </div>
                             </div>
+                            <div class="form-group">
+                                <label class="col-md-3 control-label required">Location</label>
+                                <div class="col-md-9">
+                                    <p class="form-control-static">{{ termination_a.device.location|placeholder }}</p>
+                                </div>
+                            </div>
                             <div class="form-group">
                                 <label class="col-md-3 control-label required">Rack</label>
                                 <div class="col-md-9">
-                                    <p class="form-control-static">{{ termination_a.device.rack|default:"None" }}</p>
+                                    <p class="form-control-static">{{ termination_a.device.rack|placeholder }}</p>
                                 </div>
                             </div>
                             <div class="form-group">