Some cleaning

TypiCMS · Nov 8, 2021 · 03748e4 · 03748e4
1 parent dc91140
commit 03748e4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/src/Exports/Export.php b/src/Exports/Export.php
@@ -16,11 +16,9 @@
 
 class Export implements WithColumnFormatting, ShouldAutoSize, FromCollection, WithHeadings, WithMapping
 {
-    protected $collection;
-
-    public function __construct($request)
+    public function collection()
     {
-        $this->collection = QueryBuilder::for(Place::class)
+        return QueryBuilder::for(Place::class)
             ->allowedSorts(['id', 'status_translated', 'title_translated'])
             ->allowedFilters([
                 AllowedFilter::custom('title', new FilterOr()),
@@ -71,9 +69,4 @@ public function columnFormats(): array
             'B' => NumberFormat::FORMAT_DATE_DATETIME,
         ];
     }
-
-    public function collection()
-    {
-        return $this->collection;
-    }
 }
diff --git a/src/Http/Controllers/AdminController.php b/src/Http/Controllers/AdminController.php
@@ -23,7 +23,7 @@ public function export(Request $request)
     {
         $filename = date('Y-m-d').' '.config('app.name').' places.xlsx';
 
-        return Excel::download(new Export($request), $filename);
+        return Excel::download(new Export(), $filename);
     }
 
     public function create(): View