Skip to content

A self-hosted media server and file management system

fix error handling value

aminnausin5afdb8592f2d
diff --git a/app/Http/Controllers/DirectoryController.php b/app/Http/Controllers/DirectoryController.php
index 557dd29d..54b642db 100644
--- a/app/Http/Controllers/DirectoryController.php
+++ b/app/Http/Controllers/DirectoryController.php
@@ -20,7 +20,6 @@ class DirectoryController extends Controller
$data['message'] = 'Unauthorized';
return view('error', $data);
}
-
$dirRaw = Category::select('id')->firstWhere('name', 'ilike', '%' . $request->dir . '%');
if(isset($dirRaw->id)){
@@ -34,7 +33,7 @@ class DirectoryController extends Controller
}
}
else{
- $data['dir'] = array('id'=>$dirRaw->id,'name'=>$request->dir);
+ $data['dir'] = array('id'=>null,'name'=>$request->dir);
$data['folder'] = array('id'=>null, 'name'=>null);
}
diff --git a/public/js/main.js b/public/js/main.js
index 925f4b94..13f80a5f 100644
--- a/public/js/main.js
+++ b/public/js/main.js
@@ -229,7 +229,7 @@ function parseHistory(data, count = 10, empty = true) {
async function loadCategoryFolders(){
const csrfToken = document.querySelector('meta[name="csrf-token"]').getAttribute('content');
- if(stateDirectory.id === -1){
+ if(isNaN(parseInt(stateDirectory.id))){
toastr["error"](`An invalid category "${stateDirectory.name}" was provided in the URL.`, "Invalid Category");
return;
}