FIX: lots of bugfixes, sorry for ugly commit

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
@@ -34,7 +34,7 @@ class CreateNewDirectory extends Controller
*
* @return $this|\Illuminate\Http\JsonResponse|\Illuminate\Http\RedirectResponse
*/
public function postNew(Request $request)
public function store(Request $request)
{
// create new directory
try {
@@ -1,6 +1,7 @@
<?php
namespace App\Http\Controllers\Admin\FileManager;
use App\CMS\Helpers\Path;
use App\CMS\Helpers\Template;
use App\Http\Controllers\Admin\Controller;
use App\Http\Requests\Request;
@@ -82,7 +83,7 @@ class UploadFile extends Controller
return view('admin.snippets.ckEditorUploaded', [
'ckEditor' => Input::get('CKEditor'),
'funcNumber' => Input::get('CKEditorFuncNum'),
'fileUrl' => Template::upload($uploadedFile['filename'])
'fileUrl' => Path::upload($uploadedFile['filename'])
]);
}
@@ -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
]);
}
}