From a771061c45f1ada358145c1ef180bc8ee0ea5e17 Mon Sep 17 00:00:00 2001
From: Arthur <worldnomad@gmail.com>
Date: Mon, 24 Jul 2023 18:11:23 +0700
Subject: [PATCH] 13044 honor allow_token_retreival

---
 netbox/templates/users/usertoken.html | 4 ++--
 netbox/users/tables.py                | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/netbox/templates/users/usertoken.html b/netbox/templates/users/usertoken.html
index 766eb6882..fc52780f0 100644
--- a/netbox/templates/users/usertoken.html
+++ b/netbox/templates/users/usertoken.html
@@ -3,7 +3,7 @@
 {% load helpers %}
 {% load render_table from django_tables2 %}
 
-{% block title %}{% trans "User" %} {{ object.key }}{% endblock %}
+{% block title %}{% trans "Token" %} {{ object }}{% endblock %}
 
 {% block subtitle %}{% endblock %}
 
@@ -16,7 +16,7 @@
           <table class="table table-hover attr-table">
             <tr>
               <th scope="row">{% trans "Key" %}</th>
-              <td>{{ object.key }}</td>
+              <td>{{ object }}</td>
             </tr>
             <tr>
               <th scope="row">{% trans "User" %}</th>
diff --git a/netbox/users/tables.py b/netbox/users/tables.py
index a8d0e74e1..9c9e4aea7 100644
--- a/netbox/users/tables.py
+++ b/netbox/users/tables.py
@@ -1,3 +1,4 @@
+from django.conf import settings
 import django_tables2 as tables
 
 from netbox.tables import NetBoxTable, columns
@@ -59,7 +60,6 @@ class TokenTable(NetBoxTable):
 class UserTokenTable(NetBoxTable):
     key = columns.TemplateColumn(
         template_code=TOKEN,
-        linkify=True,
     )
     write_enabled = columns.BooleanColumn(
         verbose_name='Write'
@@ -77,9 +77,9 @@ class UserTokenTable(NetBoxTable):
 
     class Meta(NetBoxTable.Meta):
         model = UserToken
-        fields = (
-            'pk', 'key', 'user', 'description', 'write_enabled', 'created', 'expires', 'last_used', 'allowed_ips',
-        )
+        fields = [
+            'pk', 'id', 'key', 'user', 'description', 'write_enabled', 'created', 'expires', 'last_used', 'allowed_ips',
+        ]
 
 
 class UserTable(NetBoxTable):