REFACTORING #2039 @1h: clean a little bit file manager
This commit is contained in:
@@ -3,7 +3,6 @@ namespace App\Http\Controllers\Admin\FileManager;
|
||||
|
||||
use App\Http\Controllers\Admin\Controller;
|
||||
use App\Models\FileManager\Directory;
|
||||
use App\Models\FileManager\File;
|
||||
use Illuminate\Support\Facades\Input;
|
||||
|
||||
class UploadedFilesOverview extends Controller
|
||||
@@ -11,37 +10,20 @@ class UploadedFilesOverview extends Controller
|
||||
/**
|
||||
* List of all files and directories
|
||||
*
|
||||
* @param null $directoryId
|
||||
* @param null $fileType
|
||||
* @param null $fileSubtype
|
||||
* @param Directory $directory
|
||||
*
|
||||
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
|
||||
*/
|
||||
public function getOverview($directoryId = null, $fileType = null, $fileSubtype = null)
|
||||
public function index(Directory $directory =null)
|
||||
{
|
||||
// get directory information
|
||||
$directory = is_null($directoryId) ? new Directory() : Directory::findOrFail($directoryId);
|
||||
|
||||
// get all files in this directory
|
||||
$files = File::orderBy('updated_at', 'DESC')
|
||||
->where('directory_id', $directory->id);
|
||||
|
||||
// try to filter by given type
|
||||
if (!is_null($fileType)) {
|
||||
if (is_null($fileSubtype)) {
|
||||
$files = $files->where('mime_type', 'LIKE', $fileType . '%');
|
||||
} else {
|
||||
$files = $files->where('mime_type', $fileType . '/' . $fileSubtype);
|
||||
}
|
||||
}
|
||||
|
||||
// include hidden directories?
|
||||
$includeHidden = Input::get('hidden');
|
||||
|
||||
$subdirectories = $includeHidden ? $directory->allSubdirectories : $directory->subdirectories;
|
||||
|
||||
return view('admin.fileManager.overview', [
|
||||
'directory' => $directory,
|
||||
'subdirectories' => $directory->subdirectories($includeHidden),
|
||||
'files' => $files->get(),
|
||||
'subdirectories' => $subdirectories,
|
||||
'newDirectory' => new Directory()
|
||||
]);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user