minicms/core
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

FIX: lots of bugfixes, sorry for ugly commit

Browse Source
This commit is contained in:
Michal Kváček
2017-02-09 23:10:11 +01:00
parent 99ed8806da
commit b7d4ab9515
47 changed files with 180 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Admin/FileManager/UploadedFilesOverview.php
+16 -5
View File
@@ -14,17 +14,28 @@ class UploadedFilesOverview extends Controller
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
*/
public function index(Directory $directory =null)
public function index(Directory $directory = null)
{
// include hidden directories?
$includeHidden = Input::get('hidden');
$subdirectories = $includeHidden ? $directory->allSubdirectories : $directory->subdirectories;
if (!$directory->exists) {
$subdirectories = Directory::whereNull('parent_id');
} else {
$subdirectories = $directory->allSubdirectories();
}
if ($includeHidden === false) {
$subdirectories = $subdirectories->where('hidden', false);
}
$subdirectories = $subdirectories->get();
return view('admin.fileManager.overview', [
'directory' => $directory,
'subdirectories' => $subdirectories,
'newDirectory' => new Directory()
'directory' => $directory,
'subdirectories' => $subdirectories,
'newDirectory' => new Directory(),
'parentDirectory' => $directory
]);
}
}