Implemented usage of model attributes first

allanvb · Aug 17, 2021 · a24609d · a24609d
1 parent adb4fc0
commit a24609d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 All notable changes in Laravel Nova Exports will be documented in this file
 
+## 1.1.2
+- Implemented usage of model attributes first
+
 ## 1.1.1
 - Added `disk()` method for external storages.
 

diff --git a/src/NovaExportAction.php b/src/NovaExportAction.php
@@ -88,11 +88,17 @@ public function __construct(NovaResource $novaResource)
 
         $this->table = $this->model->getTable();
 
-        $this->tableColumns = collect(
-            Schema::getColumnListing(
-                $this->table
-            )
-        );
+        $modelAttributes = array_keys($novaResource->resource->getAttributes());
+
+        if (!blank($modelAttributes)) {
+            $this->tableColumns = collect($modelAttributes);
+        } else {
+            $this->tableColumns = collect(
+                Schema::getColumnListing(
+                    $this->table
+                )
+            );
+        }
 
         $this->queryBuilder = DB::table(
             $this->table