From 7a54302a653d03d08104a8cedb8ae408a781f4fa Mon Sep 17 00:00:00 2001
From: Daniel Sheppard <dans@dansheps.com>
Date: Tue, 23 Apr 2024 14:04:37 -0500
Subject: [PATCH] Minor tweaks

---
 netbox/dcim/views.py                  |  1 -
 netbox/templates/dcim/cable_edit.html | 18 ++----------------
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index ddbbb7642..d3ea3acd7 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -23,7 +23,6 @@ from netbox.constants import DEFAULT_ACTION_PERMISSIONS
 from netbox.views import generic
 from tenancy.views import ObjectContactsView
 from utilities.forms import ConfirmationForm
-from utilities.htmx import is_htmx
 from utilities.paginator import EnhancedPaginator, get_paginate_count
 from utilities.permissions import get_permission_for_model
 from utilities.query_functions import CollateAsChar
diff --git a/netbox/templates/dcim/cable_edit.html b/netbox/templates/dcim/cable_edit.html
index f7058e47d..c27ca2992 100644
--- a/netbox/templates/dcim/cable_edit.html
+++ b/netbox/templates/dcim/cable_edit.html
@@ -21,7 +21,7 @@
     {% endif %}
     {% if 'a_terminations' in form.fields %}
       {% render_field form.a_terminations %}
-    {% elif 'b_terminations' in form.fields %}
+    {% else %}
       <div class="row mb-3">
         <label class="col-sm-3 col-form-label text-lg-end">{% trans "Termination Type" %}</label>
         <div class="col" hx-select="#a_termination_block" hx-target="#a_termination_block">
@@ -31,13 +31,6 @@
           <button class="btn btn-primary" hx-get="?a_terminations_type=circuits.circuittermination">{% trans "Circuit Termination" %}</button>
         </div>
       </div>
-    {% else %}
-      <div class="row mb-3">
-        <label for="a_terminations" class="col-sm-3 col-form-label text-lg-end">{% trans "Termination Type" %}</label>
-        <div class="col col-form-label">Cannot initialize dynamic cable termination selection form</div>
-        <select class="ts-hidden-accessible" name="a_terminations" required></select>
-        <div class="invalid-feedback">This field is required.</div>
-      </div>
     {% endif %}
   </div>
 
@@ -57,7 +50,7 @@
     {% endif %}
     {% if 'b_terminations' in form.fields %}
         {% render_field form.b_terminations %}
-    {% elif 'a_terminations' in form.fields %}
+    {% else %}
       <div class="row mb-3">
         <label class="col-sm-3 col-form-label text-lg-end">{% trans "Termination Type" %}</label>
         <div class="col" hx-select="#b_termination_block" hx-target="#b_termination_block">
@@ -67,13 +60,6 @@
           <button class="btn btn-primary" hx-get="?b_terminations_type=circuits.circuittermination">{% trans "Circuit Termination" %}</button>
         </div>
       </div>
-    {% else %}
-      <div class="row mb-3">
-        <label for="b_terminantions" class="col-sm-3 col-form-label text-lg-end">{% trans "Termination Type" %}</label>
-        <div class="col col-form-label">Cannot initialize dynamic cable termination selection form</div>
-          <select class="ts-hidden-accessible" name="b_terminations" required></select>
-          <div class="invalid-feedback">This field is required.</div>
-      </div>
     {% endif %}
   </div>