FIX: fix file manager

app/Http/Controllers/Admin/FileManager/EditUploadedFile.php

@@ -2,13 +2,13 @@
 
 namespace App\Http\Controllers\Admin\FileManager;
 
-use App\Events\EditFile;
 use App\CMS\Helpers\FileManager;
+use App\CMS\Helpers\RootDirectory;
+use App\Events\EditFile;
 use App\Http\Controllers\Admin\Controller;
 use App\Http\Requests\EditUploadedFileRequest;
 use App\Models\FileManager\File;
 use Illuminate\Support\Facades\Event;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 class EditUploadedFile extends Controller
 {
@@ -17,14 +17,18 @@ class EditUploadedFile extends Controller
      *
      * Render edit form for displaying details and updating given file
      *
-     * @param int $id file id
+     * @param File $file
      *
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\View\View
+     * @internal param int $id file id
+     *
      */
     public function show(File $file)
     {
+        $root = RootDirectory::get();
         return view('admin.fileManager.edit', [
             'file'      => $file,
+            'root'      => $root,
             'extraInfo' => FileManager::getAdditionalInfo($file)
         ]);
     }
@@ -48,6 +52,7 @@ class EditUploadedFile extends Controller
         $file->name = $request->name;
         $file->keywords = $request->keywords;
         $file->description = $request->description;
+        $file->directory_id = $request->directory_id;
         $file->save();
 
         // fire action

app/Http/Controllers/Admin/FileManager/UploadFile.php

@@ -27,7 +27,7 @@ class UploadFile extends Controller
      *
      * @param Request $request
      *
-     * @return \Illuminate\Http\JsonResponse|\Illuminate\Http\RedirectResponse
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\View\View
      */
     public function store(Request $request)
     {

app/Http/Controllers/Admin/FileManager/UploadedFilesOverview.php

@@ -1,12 +1,28 @@
 <?php
 namespace App\Http\Controllers\Admin\FileManager;
 
+use App\CMS\Repositories\FileManager\Directory as DirectoryRepository;
 use App\Http\Controllers\Admin\Controller;
 use App\Models\FileManager\Directory;
 use Illuminate\Support\Facades\Input;
 
 class UploadedFilesOverview extends Controller
 {
+    /**
+     * @var DirectoryRepository
+     */
+    private $directoryRepository;
+
+    /**
+     * UploadedFilesOverview constructor.
+     *
+     * @param DirectoryRepository $directoryRepository
+     */
+    public function __construct(DirectoryRepository $directoryRepository)
+    {
+        $this->directoryRepository = $directoryRepository;
+    }
+
     /**
      * List of all files and directories
      *
@@ -19,13 +35,9 @@ class UploadedFilesOverview extends Controller
         // include hidden directories?
         $includeHidden = Input::get('hidden');
 
-        if (!$directory->exists) {
-            $subdirectories = Directory::whereNull('parent_id');
-        } else {
-            $subdirectories = $directory->allSubdirectories();
-        }
+        $subdirectories = $this->directoryRepository->getAllSubdirectories($directory);
 
-        if ($includeHidden === false) {
+        if (!$includeHidden) {
             $subdirectories = $subdirectories->where('hidden', false);
         }