X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/c429cf78187e80deb63982a282a1c6889f30291a..refs/pull/3693/head:/app/Http/Controllers/Images/DrawioImageController.php diff --git a/app/Http/Controllers/Images/DrawioImageController.php b/app/Http/Controllers/Images/DrawioImageController.php index 2a4576df1..cab1c925e 100644 --- a/app/Http/Controllers/Images/DrawioImageController.php +++ b/app/Http/Controllers/Images/DrawioImageController.php @@ -30,7 +30,7 @@ class DrawioImageController extends Controller $imgData = $this->imageRepo->getEntityFiltered('drawio', $parentTypeFilter, $page, 24, $uploadedToFilter, $searchTerm); - return view('components.image-manager-list', [ + return view('pages.parts.image-manager-list', [ 'images' => $imgData['images'], 'hasMore' => $imgData['has_more'], ]); @@ -44,8 +44,8 @@ class DrawioImageController extends Controller public function create(Request $request) { $this->validate($request, [ - 'image' => 'required|string', - 'uploaded_to' => 'required|integer', + 'image' => ['required', 'string'], + 'uploaded_to' => ['required', 'integer'], ]); $this->checkPermission('image-create-all'); @@ -67,13 +67,12 @@ class DrawioImageController extends Controller public function getAsBase64($id) { $image = $this->imageRepo->getById($id); - $page = $image->getPage(); - if ($image === null || $image->type !== 'drawio' || !userCan('page-view', $page)) { + if (is_null($image) || $image->type !== 'drawio' || !userCan('page-view', $image->getPage())) { return $this->jsonError('Image data could not be found'); } $imageData = $this->imageRepo->getImageData($image); - if ($imageData === null) { + if (is_null($imageData)) { return $this->jsonError('Image data could not be found'); }