From 12476036cd3dc5990d2a6c9973ed9ccc758c377d Mon Sep 17 00:00:00 2001
From: jeremystretch <jstretch@ns1.com>
Date: Mon, 25 Jul 2022 09:55:20 -0400
Subject: [PATCH 1/2] Changelog for #9794, #9818

---
 docs/release-notes/version-3.3.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/release-notes/version-3.3.md b/docs/release-notes/version-3.3.md
index 4b3f1dcb2..ad9ce1a0e 100644
--- a/docs/release-notes/version-3.3.md
+++ b/docs/release-notes/version-3.3.md
@@ -103,6 +103,8 @@ Custom field UI visibility has no impact on API operation.
 * [#9730](https://github.com/netbox-community/netbox/issues/9730) - Fix validation error when creating a new cable via UI form
 * [#9733](https://github.com/netbox-community/netbox/issues/9733) - Handle split paths during trace when fanning out to front ports with differing cables
 * [#9765](https://github.com/netbox-community/netbox/issues/9765) - Report correct segment count under cable trace UI view
+* [#9794](https://github.com/netbox-community/netbox/issues/9794) - Fix link to connect a rear port to a circuit termination
+* [#9818](https://github.com/netbox-community/netbox/issues/9818) - Fix circuit side selection when connecting a cable to a circuit termination
 
 ### Plugins API
 

From 2583abc39d4eafdca645bc18110140f1e350c7df Mon Sep 17 00:00:00 2001
From: jeremystretch <jstretch@ns1.com>
Date: Mon, 25 Jul 2022 11:34:16 -0400
Subject: [PATCH 2/2] Fix null cable termination representation

---
 .../templates/dcim/inc/cable_termination.html | 118 +++++++++---------
 1 file changed, 61 insertions(+), 57 deletions(-)

diff --git a/netbox/templates/dcim/inc/cable_termination.html b/netbox/templates/dcim/inc/cable_termination.html
index 9d1c43bdd..ced9bda50 100644
--- a/netbox/templates/dcim/inc/cable_termination.html
+++ b/netbox/templates/dcim/inc/cable_termination.html
@@ -1,58 +1,62 @@
 {% load helpers %}
-<table class="table table-hover panel-body attr-table">
-  {% if terminations.0.device %}
-    {# Device component #}
-    <tr>
-      <td>Site</td>
-      <td>{{ terminations.0.device.site|linkify }}</td>
-    </tr>
-    <tr>
-      <td>Rack</td>
-      <td>{{ terminations.0.device.rack|linkify|placeholder }}</td>
-    </tr>
-    <tr>
-      <td>Device</td>
-      <td>{{ terminations.0.device|linkify }}</td>
-    </tr>
-    <tr>
-      <td>{{ terminations.0|meta:"verbose_name"|capfirst }}</td>
-      <td>
-        {% for term in terminations %}
-          {{ term|linkify }}{% if not forloop.last %},{% endif %}
-        {% endfor %}
-      </td>
-    </tr>
-  {% elif terminations.0.power_panel %}
-    {# Power feed #}
-    <tr>
-      <td>Site</td>
-      <td>{{ terminations.0.power_panel.site|linkify }}</td>
-    </tr>
-    <tr>
-      <td>Power Panel</td>
-      <td>{{ terminations.0.power_panel|linkify }}</td>
-    </tr>
-    <tr>
-      <td>{{ terminations.0|meta:"verbose_name"|capfirst }}</td>
-      <td>
-        {% for term in terminations %}
-          {{ term|linkify }}{% if not forloop.last %},{% endif %}
-        {% endfor %}
-      </td>
-    </tr>
-  {% else %}
-    {# Circuit termination #}
-    <tr>
-      <td>Provider</td>
-      <td>{{ terminations.0.circuit.provider|linkify }}</td>
-    </tr>
-    <tr>
-      <td>Circuit</td>
-      <td>
-        {% for term in terminations %}
-          {{ term.circuit|linkify }} ({{ term }}){% if not forloop.last %},{% endif %}
-        {% endfor %}
-      </td>
-    </tr>
-  {% endif %}
-</table>
+{% if terminations.0 %}
+  <table class="table table-hover panel-body attr-table">
+    {% if terminations.0.device %}
+      {# Device component #}
+      <tr>
+        <td>Site</td>
+        <td>{{ terminations.0.device.site|linkify }}</td>
+      </tr>
+      <tr>
+        <td>Rack</td>
+        <td>{{ terminations.0.device.rack|linkify|placeholder }}</td>
+      </tr>
+      <tr>
+        <td>Device</td>
+        <td>{{ terminations.0.device|linkify }}</td>
+      </tr>
+      <tr>
+        <td>{{ terminations.0|meta:"verbose_name"|capfirst }}</td>
+        <td>
+          {% for term in terminations %}
+            {{ term|linkify }}{% if not forloop.last %},{% endif %}
+          {% endfor %}
+        </td>
+      </tr>
+    {% elif terminations.0.power_panel %}
+      {# Power feed #}
+      <tr>
+        <td>Site</td>
+        <td>{{ terminations.0.power_panel.site|linkify }}</td>
+      </tr>
+      <tr>
+        <td>Power Panel</td>
+        <td>{{ terminations.0.power_panel|linkify }}</td>
+      </tr>
+      <tr>
+        <td>{{ terminations.0|meta:"verbose_name"|capfirst }}</td>
+        <td>
+          {% for term in terminations %}
+            {{ term|linkify }}{% if not forloop.last %},{% endif %}
+          {% endfor %}
+        </td>
+      </tr>
+    {% elif terminations.0.circuit %}
+      {# Circuit termination #}
+      <tr>
+        <td>Provider</td>
+        <td>{{ terminations.0.circuit.provider|linkify }}</td>
+      </tr>
+      <tr>
+        <td>Circuit</td>
+        <td>
+          {% for term in terminations %}
+            {{ term.circuit|linkify }} ({{ term }}){% if not forloop.last %},{% endif %}
+          {% endfor %}
+        </td>
+      </tr>
+    {% endif %}
+  </table>
+{% else %}
+  <span class="text-muted">No termination</span>
+{% endif %}