From d0b85586b96e1c78ee0aa7eba29bf5470d12728f Mon Sep 17 00:00:00 2001
From: jeremystretch <jstretch@ns1.com>
Date: Tue, 2 Nov 2021 16:24:28 -0400
Subject: [PATCH] Changelog & cleanup for #6930

---
 docs/release-notes/version-3.0.md | 1 +
 netbox/circuits/tables.py         | 2 +-
 netbox/utilities/tables.py        | 9 ++++-----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/release-notes/version-3.0.md b/docs/release-notes/version-3.0.md
index c9f58d98f..18af70e7f 100644
--- a/docs/release-notes/version-3.0.md
+++ b/docs/release-notes/version-3.0.md
@@ -4,6 +4,7 @@
 
 ### Enhancements
 
+* [#6930](https://github.com/netbox-community/netbox/issues/6930) - Add an optional "ID" column to all tables
 * [#7668](https://github.com/netbox-community/netbox/issues/7668) - Add "view elevations" button to location view
 
 ### Bug Fixes
diff --git a/netbox/circuits/tables.py b/netbox/circuits/tables.py
index 847d44ffd..1748e6110 100644
--- a/netbox/circuits/tables.py
+++ b/netbox/circuits/tables.py
@@ -101,7 +101,7 @@ class CircuitTable(BaseTable):
     pk = ToggleColumn()
     cid = tables.Column(
         linkify=True,
-        verbose_name='ID'
+        verbose_name='Circuit ID'
     )
     provider = tables.Column(
         linkify=True
diff --git a/netbox/utilities/tables.py b/netbox/utilities/tables.py
index 8258bd5e8..b92cde47c 100644
--- a/netbox/utilities/tables.py
+++ b/netbox/utilities/tables.py
@@ -23,6 +23,10 @@ class BaseTable(tables.Table):
 
     :param user: Personalize table display for the given user (optional). Has no effect if AnonymousUser is passed.
     """
+    id = tables.Column(
+        linkify=True,
+        verbose_name='ID'
+    )
 
     class Meta:
         attrs = {
@@ -133,11 +137,6 @@ class BaseTable(tables.Table):
             self._objects_count = sum(1 for obj in self.data if hasattr(obj, 'pk'))
         return self._objects_count
 
-    id = tables.Column(
-        linkify=True,
-        verbose_name='ID'
-    )
-
 
 #
 # Table columns