From 21cf287998eaf2c7a1b15be090c04eae3ab7a502 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Mon, 20 Jun 2022 18:41:12 +0300 Subject: [PATCH] Fixed widget and report alias issue.. ( #32baajc ) --- app/Utilities/Reports.php | 2 +- app/Utilities/Widgets.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Utilities/Reports.php b/app/Utilities/Reports.php index 67b0f45fb..05a5dec1f 100644 --- a/app/Utilities/Reports.php +++ b/app/Utilities/Reports.php @@ -54,7 +54,7 @@ class Reports return false; } - if (($model->alias != 'core') && (new static)->moduleIsDisabled($model->alias)) { + if (! empty($model) && ($model->alias != 'core') && (new static)->moduleIsDisabled($model->alias)) { return false; } diff --git a/app/Utilities/Widgets.php b/app/Utilities/Widgets.php index b9a97a7e4..7d2ebc04b 100644 --- a/app/Utilities/Widgets.php +++ b/app/Utilities/Widgets.php @@ -65,7 +65,7 @@ class Widgets $model = Widget::where('dashboard_id', session('dashboard_id'))->where('class', $class_name)->first(); - if (($model->alias != 'core') && (new static)->moduleIsDisabled($model->alias)) { + if (! empty($model) && ($model->alias != 'core') && (new static)->moduleIsDisabled($model->alias)) { return false; }