From 9dad7e4daf22bce29ce9318f849a81dac2647c33 Mon Sep 17 00:00:00 2001
From: jeremystretch <jstretch@ns1.com>
Date: Tue, 9 Nov 2021 16:04:16 -0500
Subject: [PATCH] Fixes #7701: Fix conflation of assigned IP status & role in
 interface tables

---
 docs/release-notes/version-3.0.md           |   1 +
 netbox/dcim/tables/template_code.py         |  18 +++++++-----------
 netbox/project-static/dist/netbox-dark.css  | Bin 788776 -> 788777 bytes
 netbox/project-static/dist/netbox-light.css | Bin 493600 -> 493601 bytes
 netbox/project-static/dist/netbox-print.css | Bin 1623462 -> 1623463 bytes
 netbox/project-static/styles/netbox.scss    |   2 +-
 6 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/docs/release-notes/version-3.0.md b/docs/release-notes/version-3.0.md
index 6fe9948a0..1f3716383 100644
--- a/docs/release-notes/version-3.0.md
+++ b/docs/release-notes/version-3.0.md
@@ -8,6 +8,7 @@
 
 ### Bug Fixes
 
+* [#7701](https://github.com/netbox-community/netbox/issues/7701) - Fix conflation of assigned IP status & role in interface tables
 * [#7752](https://github.com/netbox-community/netbox/issues/7752) - Fix minimum version check under Python v3.10
 * [#7766](https://github.com/netbox-community/netbox/issues/7766) - Add missing outer dimension columns to rack table
 * [#7780](https://github.com/netbox-community/netbox/issues/7780) - Preserve mutli-line values during CSV file import
diff --git a/netbox/dcim/tables/template_code.py b/netbox/dcim/tables/template_code.py
index 2f359e1b9..092fe3b95 100644
--- a/netbox/dcim/tables/template_code.py
+++ b/netbox/dcim/tables/template_code.py
@@ -40,17 +40,13 @@ DEVICEBAY_STATUS = """
 
 INTERFACE_IPADDRESSES = """
 <div class="table-badge-group">
-    {% for ip in record.ip_addresses.all %}
-        <a
-        class="table-badge{% if ip.status != 'active' %} badge bg-{{ ip.get_status_class }}{% elif ip.role %} badge bg-{{ ip.get_role_class }}{% endif %}"
-        href="{{ ip.get_absolute_url }}"
-        {% if ip.status != 'active'%}data-bs-toggle="tooltip" data-bs-placement="left" title="{{ ip.get_status_display }}"
-        {% elif ip.role %}data-bs-toggle="tooltip" data-bs-placement="left" title="{{ ip.get_role_display }}"
-        {% endif %}
-        >
-        {{ ip }}
-        </a>
-    {% endfor %}
+  {% for ip in record.ip_addresses.all %}
+    {% if ip.status != 'active' %}
+      <a href="{{ ip.get_absolute_url }}" class="table-badge badge bg-{{ ip.get_status_class }}" data-bs-toggle="tooltip" data-bs-placement="left" title="{{ ip.get_status_display }}">{{ ip }}</a>
+    {% else %}
+      <a href="{{ ip.get_absolute_url }}" class="table-badge">{{ ip }}</a>
+    {% endif %}
+  {% endfor %}
 </div>
 """
 
diff --git a/netbox/project-static/dist/netbox-dark.css b/netbox/project-static/dist/netbox-dark.css
index b06cca0a11d640e5d728a81d25e0745825aa204a..bac0e589ac527f59e5f9cb369769f0e2c93501e1 100644
GIT binary patch
delta 52
zcmV-40L%ZVk}#=~Fo1*sgaU*Egam{Iga(8Mgb0KQgbK6^(fgO5rU(U>r=ANVm(KkQ
K47UXQ3nUE$+7q7u

delta 46
zcmV+}0MY-ck}#-}Fo1*sgaU*Egam{Iga(8Mgb0KQgbK6^(fgC2s3(`t{R<4Y1^f#n
E4VeHDumAu6

diff --git a/netbox/project-static/dist/netbox-light.css b/netbox/project-static/dist/netbox-light.css
index cf06883a981bf8a07b403e0a852b2a0a12b620af..3ae6b577918c8c0e2ee575ae28d6e8002fd11ebb 100644
GIT binary patch
delta 31
ncmZ25L2ls$xrP?T7N!>F7M2#)7Pc+y&+8bCwm+|9x8wu>w<rq(

delta 34
qcmZ2DL2khWxrP?T7N!>F7M2#)7Pc+y&+Df1+q1K7e_O|H!U+J_zYD?u

diff --git a/netbox/project-static/dist/netbox-print.css b/netbox/project-static/dist/netbox-print.css
index 7e565c3d5be6b900a59495cd008ed04c0bad79ad..7974e338d08659ae8a191e608fd831cf2d961d6a 100644
GIT binary patch
delta 87
zcmV-d0I2__i({vYV}OJKgaU*Egam{Iga(8Mgb0KQgbIWUgbaiYgbsucgb;)ggc5`k
tgcO7ogcgJsv=|Pnm#~5n1(!(g7ZjJxs~8WLXR8<;lQ0qnw^*wfP8tO?9UuSz

delta 81
zcmZ49oxH3&xuJ!zg{g(Pg{6hHg{_6Xg`<VDg{y_Tg{OtLg|CIbMW98nMW{u%MWjWv
lMXW`9iv-{5spohkrk`6a!9P7?wS??s10lBUk*g*AqySe@8qxp&

diff --git a/netbox/project-static/styles/netbox.scss b/netbox/project-static/styles/netbox.scss
index 8ce526985..b21f38f89 100644
--- a/netbox/project-static/styles/netbox.scss
+++ b/netbox/project-static/styles/netbox.scss
@@ -814,7 +814,7 @@ table .table-badge-group {
     }
 
     &.badge:not(:last-of-type):not(:only-child) {
-      margin-bottom: map.get($spacers, 2);
+      margin-bottom: map.get($spacers, 1);
     }
   }
 }