From 3e9477ddc3a1a7a9c5529ebe2d9aa2ffa18ee9e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= <michal@binarity.cz>
Date: Mon, 8 Feb 2016 16:15:03 +0100
Subject: [PATCH] FEATURE #1417: add filtering for file overview

---
 .../Controllers/Admin/UploadedFilesOverview.php     | 13 +++++++++----
 app/Http/routes.php                                 |  2 +-
 resources/lang/en/admin/fileManager.php             |  3 ++-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/Admin/UploadedFilesOverview.php b/app/Http/Controllers/Admin/UploadedFilesOverview.php
index 1d9e2ef5..93721771 100644
--- a/app/Http/Controllers/Admin/UploadedFilesOverview.php
+++ b/app/Http/Controllers/Admin/UploadedFilesOverview.php
@@ -8,18 +8,23 @@ use App\Models\File;
 
 class UploadedFilesOverview extends Controller
 {
-    public function getOverview($type = null)
+    public function getOverview($type = null, $subtype = null)
     {
         $directories = [];
 
-        $files = File::orderBy('updated_at', 'DESC')
-                     ->paginate(18);
+        $files = File::orderBy('updated_at', 'DESC');
 
         // try to filter by given type
         if (!is_null($type)) {
-            $files = $files->where('mime_type', 'LIKE', $type);
+            if (is_null($subtype))
+            $files = $files->where('mime_type', 'LIKE', $type.'%');
+            else {
+                $files = $files->where('mime_type', $type.'/'.$subtype);
+            }
         }
 
+        $files = $files->paginate(18);
+
         return view('admin.fileManager.overview', [
             'direcories' => $directories,
             'files'      => $files
diff --git a/app/Http/routes.php b/app/Http/routes.php
index 240b2fe2..1f104906 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -96,7 +96,7 @@ Route::group([
     Route::get('upload/image', 'UploadFile@getImage')
          ->name('upload.image');
 
-    Route::get('upload/overview', 'UploadedFilesOverview@getOverview')
+    Route::get('upload/overview/{type?}/{subtype?}', 'UploadedFilesOverview@getOverview')
          ->name('upload.overview');
 
     // uploader methods
diff --git a/resources/lang/en/admin/fileManager.php b/resources/lang/en/admin/fileManager.php
index c180b464..8eaa5a6c 100644
--- a/resources/lang/en/admin/fileManager.php
+++ b/resources/lang/en/admin/fileManager.php
@@ -8,5 +8,6 @@ return [
     'uploadSuccessfull' => 'Your file was successfully uploaded',
     'selectFile'        => 'Select file for upload',
     'keywords'          => 'Keywords (comma separated)',
-    'description'       => 'File description'
+    'description'       => 'File description',
+    'noFiles'           => 'No files were found. Try to upload some.'
 ];
\ No newline at end of file