From 67fb3c6945a1bcff1c1a6e695a1c6c45e18a362f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= Date: Wed, 2 Aug 2017 10:39:15 +0200 Subject: [PATCH] FEATURE #2039 @15m: clean up the code --- app/CMS/Interactions/Admin/FileManager/DeleteFile.php | 0 app/CMS/Interactions/Admin/FileManager/EditDirectory.php | 0 .../Admin/FileManager/EditFileMetaInformation.php | 0 app/CMS/Interactions/Admin/FileManager/UploadFile.php | 0 .../Interactions/Admin/FileManager/UploadFileRevision.php | 0 app/Http/Controllers/Admin/FileManager/UploadFile.php | 8 ++++---- .../Admin/FileManager/UploadedFilesOverview.php | 2 -- .../Controllers/Admin/Widgets/Areas/EditWidgetArea.php | 1 - 8 files changed, 4 insertions(+), 7 deletions(-) delete mode 100644 app/CMS/Interactions/Admin/FileManager/DeleteFile.php delete mode 100644 app/CMS/Interactions/Admin/FileManager/EditDirectory.php delete mode 100644 app/CMS/Interactions/Admin/FileManager/EditFileMetaInformation.php delete mode 100644 app/CMS/Interactions/Admin/FileManager/UploadFile.php delete mode 100644 app/CMS/Interactions/Admin/FileManager/UploadFileRevision.php diff --git a/app/CMS/Interactions/Admin/FileManager/DeleteFile.php b/app/CMS/Interactions/Admin/FileManager/DeleteFile.php deleted file mode 100644 index e69de29b..00000000 diff --git a/app/CMS/Interactions/Admin/FileManager/EditDirectory.php b/app/CMS/Interactions/Admin/FileManager/EditDirectory.php deleted file mode 100644 index e69de29b..00000000 diff --git a/app/CMS/Interactions/Admin/FileManager/EditFileMetaInformation.php b/app/CMS/Interactions/Admin/FileManager/EditFileMetaInformation.php deleted file mode 100644 index e69de29b..00000000 diff --git a/app/CMS/Interactions/Admin/FileManager/UploadFile.php b/app/CMS/Interactions/Admin/FileManager/UploadFile.php deleted file mode 100644 index e69de29b..00000000 diff --git a/app/CMS/Interactions/Admin/FileManager/UploadFileRevision.php b/app/CMS/Interactions/Admin/FileManager/UploadFileRevision.php deleted file mode 100644 index e69de29b..00000000 diff --git a/app/Http/Controllers/Admin/FileManager/UploadFile.php b/app/Http/Controllers/Admin/FileManager/UploadFile.php index 8b88e92c..3c4a7933 100644 --- a/app/Http/Controllers/Admin/FileManager/UploadFile.php +++ b/app/Http/Controllers/Admin/FileManager/UploadFile.php @@ -47,7 +47,7 @@ class UploadFile extends Controller */ private function internalUpload(Request $request) { -// try { + try { $uploadedFiles = []; $files = $request->all()['files']; @@ -62,9 +62,9 @@ class UploadFile extends Controller return redirect() ->back() ->with('success', trans_choice('admin/fileManager.uploadSuccessfull', $successfullUploads)); -// } catch (FileException $e) { -// return $this->invalidUpload('invalidFile'); -// } + } catch (FileException $e) { + return $this->invalidUpload('invalidFile'); + } } /** diff --git a/app/Http/Controllers/Admin/FileManager/UploadedFilesOverview.php b/app/Http/Controllers/Admin/FileManager/UploadedFilesOverview.php index 4f1ca901..dca32377 100644 --- a/app/Http/Controllers/Admin/FileManager/UploadedFilesOverview.php +++ b/app/Http/Controllers/Admin/FileManager/UploadedFilesOverview.php @@ -32,8 +32,6 @@ class UploadedFilesOverview extends Controller */ public function index(Directory $directory = null) { -// dd($directory); - // include hidden directories? $subdirectories = $this->directoryRepository->getAllSubdirectories($directory); diff --git a/app/Http/Controllers/Admin/Widgets/Areas/EditWidgetArea.php b/app/Http/Controllers/Admin/Widgets/Areas/EditWidgetArea.php index 4b93955d..393745b8 100644 --- a/app/Http/Controllers/Admin/Widgets/Areas/EditWidgetArea.php +++ b/app/Http/Controllers/Admin/Widgets/Areas/EditWidgetArea.php @@ -40,7 +40,6 @@ class EditWidgetArea extends Controller */ public function edit(WidgetArea $widgetArea) { - return view("test"); $associatedWidgetIds = WidgetInWidgetArea::getWidgetIdsFromArea($widgetArea->id); $widgets = Widget::where('language', LaravelLocalization::getCurrentLocale()) ->paginate(25);