From 578885225fa6747febc7187319f1a7492ba83751 Mon Sep 17 00:00:00 2001
From: jeremystretch <jstretch@ns1.com>
Date: Wed, 9 Jun 2021 15:22:58 -0400
Subject: [PATCH] Replace 'default format' export with 'all data'

---
 netbox/netbox/views/generic.py                 | 16 ++++++----------
 netbox/utilities/templates/buttons/export.html |  2 +-
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/netbox/netbox/views/generic.py b/netbox/netbox/views/generic.py
index c3bde9f9d..23b7f9c8d 100644
--- a/netbox/netbox/views/generic.py
+++ b/netbox/netbox/views/generic.py
@@ -16,7 +16,7 @@ from django.utils.safestring import mark_safe
 from django.views.generic import View
 from django_tables2.export import TableExport
 
-from extras.models import CustomField, ExportTemplate
+from extras.models import ExportTemplate
 from utilities.error_handlers import handle_protectederror
 from utilities.exceptions import AbortTransaction
 from utilities.forms import (
@@ -24,7 +24,7 @@ from utilities.forms import (
 )
 from utilities.permissions import get_permission_for_model
 from utilities.tables import paginate_table
-from utilities.utils import csv_format, normalize_querydict, prepare_cloned_fields
+from utilities.utils import normalize_querydict, prepare_cloned_fields
 from utilities.views import GetReturnURLMixin, ObjectPermissionRequiredMixin
 
 
@@ -105,8 +105,7 @@ class ObjectListView(ObjectPermissionRequiredMixin, View):
         Export all table data in CSV format.
 
         :param table: The Table instance to export
-        :param columns: A list of specific columns to include. If not specified, the default view
-        will be exported.
+        :param columns: A list of specific columns to include. If not specified, all columns will be exported.
         """
         exclude_columns = {'pk'}
         if columns:
@@ -114,10 +113,6 @@ class ObjectListView(ObjectPermissionRequiredMixin, View):
             exclude_columns.update({
                 col for col in all_columns if col not in columns
             })
-        else:
-            exclude_columns.update({
-                name for name, _ in table.available_columns
-            })
         exporter = TableExport(
             export_format=TableExport.CSV,
             table=table,
@@ -171,9 +166,10 @@ class ObjectListView(ObjectPermissionRequiredMixin, View):
 
         # Handle table-based exports (current view or static CSV-based)
         if request.GET.get('export') == 'table':
-            return self.export_table(table)
+            columns = [name for name, _ in table.selected_columns]
+            return self.export_table(table, columns)
         elif 'export' in request.GET:
-            return self.export_table(table, model.csv_headers)
+            return self.export_table(table)
 
         # Paginate the objects table
         paginate_table(table, request)
diff --git a/netbox/utilities/templates/buttons/export.html b/netbox/utilities/templates/buttons/export.html
index 4664d5e55..c13f0cfdf 100644
--- a/netbox/utilities/templates/buttons/export.html
+++ b/netbox/utilities/templates/buttons/export.html
@@ -4,7 +4,7 @@
     </button>
     <ul class="dropdown-menu dropdown-menu-end">
         <li><a class="dropdown-item" href="?{% if url_params %}{{ url_params.urlencode }}&{% endif %}export=table">Current View</a></li>
-        <li><a class="dropdown-item" href="?{% if url_params %}{{ url_params.urlencode }}&{% endif %}export">Default Format</a></li>
+        <li><a class="dropdown-item" href="?{% if url_params %}{{ url_params.urlencode }}&{% endif %}export">All Data</a></li>
         {% if export_templates %}
         <li>
           <hr class="dropdown-divider">