From 3a192223a38a8d6c4a833405b0ae73579585b4b9 Mon Sep 17 00:00:00 2001
From: jeremystretch <jstretch@ns1.com>
Date: Tue, 2 Nov 2021 15:58:14 -0400
Subject: [PATCH] Changelog & cleanup for #7668, #7717

---
 docs/release-notes/version-3.0.md   |  5 +++++
 netbox/ipam/tables/ip.py            |  2 +-
 netbox/templates/dcim/location.html | 17 +++++++----------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/docs/release-notes/version-3.0.md b/docs/release-notes/version-3.0.md
index 772435f4c..c9f58d98f 100644
--- a/docs/release-notes/version-3.0.md
+++ b/docs/release-notes/version-3.0.md
@@ -2,6 +2,10 @@
 
 ## v3.0.9 (FUTURE)
 
+### Enhancements
+
+* [#7668](https://github.com/netbox-community/netbox/issues/7668) - Add "view elevations" button to location view
+
 ### Bug Fixes
 
 * [#7599](https://github.com/netbox-community/netbox/issues/7599) - Improve color mode preference handling
@@ -11,6 +15,7 @@
 * [#7643](https://github.com/netbox-community/netbox/issues/7643) - Fix circuit assignment when creating multiple terminations simultaneously
 * [#7644](https://github.com/netbox-community/netbox/issues/7644) - Prevent inadvertent deletion of prior change records when deleting objects (#7333 revisited)
 * [#7647](https://github.com/netbox-community/netbox/issues/7647) - Require interface assignment when designating IP address as primary for device/VM during CSV import
+* [#7717](https://github.com/netbox-community/netbox/issues/7717) - Restore missing tags column on IP range table
 
 ---
 
diff --git a/netbox/ipam/tables/ip.py b/netbox/ipam/tables/ip.py
index 1323f551f..85f5936e1 100644
--- a/netbox/ipam/tables/ip.py
+++ b/netbox/ipam/tables/ip.py
@@ -269,7 +269,7 @@ class IPRangeTable(BaseTable):
         model = IPRange
         fields = (
             'pk', 'start_address', 'end_address', 'size', 'vrf', 'status', 'role', 'tenant', 'description',
-            'utilization','tags',
+            'utilization', 'tags',
         )
         default_columns = (
             'pk', 'start_address', 'end_address', 'size', 'vrf', 'status', 'role', 'tenant', 'description',
diff --git a/netbox/templates/dcim/location.html b/netbox/templates/dcim/location.html
index 0c254e413..7d5598bbc 100644
--- a/netbox/templates/dcim/location.html
+++ b/netbox/templates/dcim/location.html
@@ -21,17 +21,14 @@
           <tr>
             <th scope="row">Name</th>
             <td>{{ object.name }}</td>
-            <td></td>
           </tr>
           <tr>
             <th scope="row">Description</th>
             <td>{{ object.description|placeholder }}</td>
-            <td></td>
           </tr>
           <tr>
             <th scope="row">Site</th>
             <td><a href="{{ object.site.get_absolute_url }}">{{ object.site }}</a></td>
-            <td></td>
           </tr>
           <tr>
             <th scope="row">Parent</th>
@@ -42,25 +39,25 @@
                 <span class="text-muted">&mdash;</span>
               {% endif %}
             </td>
-            <td></td>
           </tr>
           <tr>
             <th scope="row">Racks</th>
             <td>
+              {% if rack_count %}
+                <div class="float-end noprint">
+                  <a href="{% url 'dcim:rack_elevation_list' %}?location_id={{ object.pk }}" class="btn btn-sm btn-primary" title="View elevations">
+                    <i class="mdi mdi-server"></i>
+                  </a>
+                </div>
+              {% endif %}
               <a href="{% url 'dcim:rack_list' %}?location_id={{ object.pk }}">{{ rack_count }}</a>
             </td>
-            <td class="noprint text-end">
-              <a href="{% url 'dcim:rack_elevation_list' %}?location_id={{ object.pk }}" class="btn btn-sm btn-primary" title="View Elevations">
-                <i class="mdi mdi-server"></i>
-              </a>
-            </td>
           </tr>
           <tr>
             <th scope="row">Devices</th>
             <td>
               <a href="{% url 'dcim:device_list' %}?location_id={{ object.pk }}">{{ device_count }}</a>
             </td>
-            <td></td>
           </tr>
         </table>
       </div>