From 924471ee76a2184fd0080d7966da57b589c82859 Mon Sep 17 00:00:00 2001
From: jeremystretch <jstretch@ns1.com>
Date: Tue, 30 Aug 2022 09:16:17 -0400
Subject: [PATCH] Clean up cable terminations display & edit form

---
 netbox/dcim/tables/template_code.py   |  2 +-
 netbox/templates/dcim/cable_edit.html | 18 ++++++------------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/netbox/dcim/tables/template_code.py b/netbox/dcim/tables/template_code.py
index ffc867e78..eeb0504d6 100644
--- a/netbox/dcim/tables/template_code.py
+++ b/netbox/dcim/tables/template_code.py
@@ -4,7 +4,7 @@ LINKTERMINATION = """
     <a href="{{ termination.parent_object.get_absolute_url }}">{{ termination.parent_object }}</a>
     <i class="mdi mdi-chevron-right"></i>
   {% endif %}
-  <a href="{{ termination.get_absolute_url }}">{{ termination }}</a>{% if not forloop.last %},{% endif %}
+  <a href="{{ termination.get_absolute_url }}">{{ termination }}</a>{% if not forloop.last %}<br />{% endif %}
 {% empty %}
   {{ ''|placeholder }}
 {% endfor %}
diff --git a/netbox/templates/dcim/cable_edit.html b/netbox/templates/dcim/cable_edit.html
index e2cef7601..29bb60d70 100644
--- a/netbox/templates/dcim/cable_edit.html
+++ b/netbox/templates/dcim/cable_edit.html
@@ -1,18 +1,8 @@
-{% extends 'base/layout.html' %}
+{% extends 'generic/object_edit.html' %}
 {% load static %}
 {% load helpers %}
 {% load form_helpers %}
 
-{% block title %}Connect Cable{% endblock %}
-
-{% block tabs %}
-<ul class="nav nav-tabs px-3">
-  <li class="nav-item" role="presentation">
-    <a href="#" role="tab" data-bs-toggle="tab" class="nav-link active">Connect Cable</a>
-  </li>
-</ul>
-{% endblock %}
-
 {% block content-wrapper %}
   <div class="tab-content">
     {% render_errors form %}
@@ -116,8 +106,12 @@
       </div>
       <div class="row my-3">
         <div class="col col-md-12 text-center">
+          {% if object.pk %}
+            <button type="submit" name="_update" class="btn btn-primary">Save</button>
+          {% else %}
+            <button type="submit" name="_create" class="btn btn-primary">Create</button>
+          {% endif %}
           <a href="{{ return_url }}" class="btn btn-outline-danger">Cancel</a>
-          <button type="submit" name="_update" class="btn btn-primary">Connect</button>
         </div>
       </div>
     </form>