From 3be724faf6ca25046e87874b4edc7807f31f37be Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@netboxlabs.com>
Date: Thu, 6 Jul 2023 11:20:58 -0400
Subject: [PATCH] Omit hash mark from target string

---
 netbox/ipam/tables/ip.py                            | 6 +++---
 netbox/templates/core/datafile.html                 | 4 ++--
 netbox/templates/dcim/device.html                   | 4 ++--
 netbox/templates/dcim/virtualdevicecontext.html     | 4 ++--
 netbox/templates/users/api_token.html               | 2 +-
 netbox/templates/virtualization/virtualmachine.html | 4 ++--
 netbox/users/tables.py                              | 2 +-
 netbox/utilities/templatetags/builtins/tags.py      | 2 +-
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/netbox/ipam/tables/ip.py b/netbox/ipam/tables/ip.py
index 3d4f4f557..aff090f3a 100644
--- a/netbox/ipam/tables/ip.py
+++ b/netbox/ipam/tables/ip.py
@@ -20,7 +20,7 @@ __all__ = (
 AVAILABLE_LABEL = mark_safe('<span class="badge bg-success">Available</span>')
 
 AGGREGATE_COPY_BUTTON = """
-{% copy_content record.pk prefix="#aggregate_" %}
+{% copy_content record.pk prefix="aggregate_" %}
 """
 
 PREFIX_LINK = """
@@ -32,7 +32,7 @@ PREFIX_LINK = """
 """
 
 PREFIX_COPY_BUTTON = """
-{% copy_content record.pk prefix="#prefix_" %}
+{% copy_content record.pk prefix="prefix_" %}
 """
 
 PREFIX_LINK_WITH_DEPTH = """
@@ -57,7 +57,7 @@ IPADDRESS_LINK = """
 """
 
 IPADDRESS_COPY_BUTTON = """
-{% copy_content record.pk prefix="#ipaddress_" %}
+{% copy_content record.pk prefix="ipaddress_" %}
 """
 
 IPADDRESS_ASSIGN_LINK = """
diff --git a/netbox/templates/core/datafile.html b/netbox/templates/core/datafile.html
index 823b194b6..785617ae5 100644
--- a/netbox/templates/core/datafile.html
+++ b/netbox/templates/core/datafile.html
@@ -39,7 +39,7 @@
               <th scope="row">Path</th>
               <td>
                 <span class="font-monospace" id="datafile_path">{{ object.path }}</span>
-                {% copy_content "#datafile_path" %}
+                {% copy_content "datafile_path" %}
               </td>
             </tr>
             <tr>
@@ -54,7 +54,7 @@
               <th scope="row">SHA256 Hash</th>
               <td>
               <span class="font-monospace" id="datafile_hash">{{ object.hash }}</span>
-                {% copy_content "#datafile_hash" %}
+                {% copy_content "datafile_hash" %}
               </td>
             </tr>
           </table>
diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html
index 89a9a14b2..4100d8259 100644
--- a/netbox/templates/dcim/device.html
+++ b/netbox/templates/dcim/device.html
@@ -200,7 +200,7 @@
                                 {% elif object.primary_ip4.nat_outside.exists %}
                                   (NAT: {% for nat in object.primary_ip4.nat_outside.all %}<a href="{{ nat.get_absolute_url }}">{{ nat.address.ip }}</a>{% if not forloop.last %}, {% endif %}{% endfor %})
                                 {% endif %}
-                                {% copy_content record.pk prefix="#primary_ip4_" %}
+                                {% copy_content record.pk prefix="primary_ip4_" %}
                               {% else %}
                                 {{ ''|placeholder }}
                               {% endif %}
@@ -216,7 +216,7 @@
                                 {% elif object.primary_ip6.nat_outside.exists %}
                                   (NAT: {% for nat in object.primary_ip6.nat_outside.all %}<a href="{{ nat.get_absolute_url }}">{{ nat.address.ip }}</a>{% if not forloop.last %}, {% endif %}{% endfor %})
                                 {% endif %}
-                                {% copy_content record.pk prefix="#primary_ip6_" %}
+                                {% copy_content record.pk prefix="primary_ip6_" %}
                               {% else %}
                                 {{ ''|placeholder }}
                               {% endif %}
diff --git a/netbox/templates/dcim/virtualdevicecontext.html b/netbox/templates/dcim/virtualdevicecontext.html
index 8a83eb1bc..e1ea943f3 100644
--- a/netbox/templates/dcim/virtualdevicecontext.html
+++ b/netbox/templates/dcim/virtualdevicecontext.html
@@ -33,7 +33,7 @@
             <td>
               {% if object.primary_ip4 %}
                 <a href="{{ object.primary_ip4.get_absolute_url }}" id="primary_ip4_{{ object.primary_ip4.pk }}">{{ object.primary_ip4 }}</a>
-                {% copy_content object.primary_ip4.pk prefix="#primary_ip4_" %}
+                {% copy_content object.primary_ip4.pk prefix="primary_ip4_" %}
              {% else %}
                 <span class="text-muted">—</span>
              {% endif %}
@@ -44,7 +44,7 @@
             <td>
               {% if object.primary_ip6 %}
                 <a href="{{ object.primary_ip6.get_absolute_url }}" id="primary_ip6_{{ object.primary_ip6.pk }}">{{ object.primary_ip6 }}</a>
-                {% copy_content object.primary_ip6.pk prefix="#primary_ip6_" %}
+                {% copy_content object.primary_ip6.pk prefix="primary_ip6_" %}
              {% else %}
                 <span class="text-muted">—</span>
              {% endif %}
diff --git a/netbox/templates/users/api_token.html b/netbox/templates/users/api_token.html
index d685baf02..7fd6f064d 100644
--- a/netbox/templates/users/api_token.html
+++ b/netbox/templates/users/api_token.html
@@ -19,7 +19,7 @@
               <th scope="row">Key</th>
               <td>
                 <div class="float-end">
-                  {% copy_content "#token_id" %}
+                  {% copy_content "token_id" %}
                 </div>
                 <div id="token_id">{{ key }}</div>
               </td>
diff --git a/netbox/templates/virtualization/virtualmachine.html b/netbox/templates/virtualization/virtualmachine.html
index 54401d5b3..3bd23367f 100644
--- a/netbox/templates/virtualization/virtualmachine.html
+++ b/netbox/templates/virtualization/virtualmachine.html
@@ -52,7 +52,7 @@
                             {% elif object.primary_ip4.nat_outside.exists %}
                               (NAT: {% for nat in object.primary_ip4.nat_outside.all %}<a href="{{ nat.get_absolute_url }}">{{ nat.address.ip }}</a>{% if not forloop.last %}, {% endif %}{% endfor %})
                             {% endif %}
-                            {% copy_content record.pk prefix="#primary_ip4_" %}
+                            {% copy_content record.pk prefix="primary_ip4_" %}
                           {% else %}
                             {{ ''|placeholder }}
                           {% endif %}
@@ -68,7 +68,7 @@
                             {% elif object.primary_ip6.nat_outside.exists %}
                               (NAT: {% for nat in object.primary_ip6.nat_outside.all %}<a href="{{ nat.get_absolute_url }}">{{ nat.address.ip }}</a>{% if not forloop.last %}, {% endif %}{% endfor %})
                             {% endif %}
-                            {% copy_content record.pk prefix="#primary_ip6_" %}
+                            {% copy_content record.pk prefix="primary_ip6_" %}
                           {% else %}
                             {{ ''|placeholder }}
                           {% endif %}
diff --git a/netbox/users/tables.py b/netbox/users/tables.py
index b82436897..cea50b10f 100644
--- a/netbox/users/tables.py
+++ b/netbox/users/tables.py
@@ -12,7 +12,7 @@ ALLOWED_IPS = """{{ value|join:", " }}"""
 
 COPY_BUTTON = """
 {% if settings.ALLOW_TOKEN_RETRIEVAL %}
-  {% copy_content record.pk prefix="#token_" color="success" %}
+  {% copy_content record.pk prefix="token_" color="success" %}
 {% endif %}
 """
 
diff --git a/netbox/utilities/templatetags/builtins/tags.py b/netbox/utilities/templatetags/builtins/tags.py
index f06d9fe60..47823bd5c 100644
--- a/netbox/utilities/templatetags/builtins/tags.py
+++ b/netbox/utilities/templatetags/builtins/tags.py
@@ -84,7 +84,7 @@ def copy_content(target, prefix=None, color='primary'):
     Display a copy button to copy the content of a field.
     """
     return {
-        'target': target if prefix is None else prefix + str(target),
+        'target': f'#{prefix or ""}{target}',
         'color': f'btn-{color}'
     }