diff --git a/src/Models/Module.php b/src/Models/Module.php index 1a63b6ce..3fb2334f 100644 --- a/src/Models/Module.php +++ b/src/Models/Module.php @@ -1207,26 +1207,26 @@ public static function processDBRow($module, $request, $row) public static function itemCount($module_name) { $module = Module::get($module_name); - if(isset($module)) { - $model_name = ucfirst(str_singular($module_name)); - if($model_name == "User" || $model_name == "Role" || $model_name == "Permission") { - if(file_exists(base_path('app/' . $model_name . ".php"))) { - $model = "App\\" . $model_name; - return $model::count(); - } else { - return -1; - } - } else { - if(file_exists(base_path('app/Models/' . $model_name . ".php"))) { - $model = "App\\Models\\" . $model_name; - return $model::count(); - } else { - return -1; - } + if(!isset($module)) { + return -1; + } + + $model_name = ucfirst(str_singular($module_name)); + if(in_array($model_name, ["User", "Role", "Permission"])) { + if(!file_exists(base_path('app/' . $model_name . ".php"))) { + return -1; } - } else { + $model = "App\\" . $model_name; + return $model::count(); + + } + + if(!file_exists(base_path('app/Models/' . $model_name . ".php"))) { return -1; } + + $model = "App\\Models\\" . $model_name; + return $model::count(); } /**