A free open source IT asset/license management system
Re-add Location Observer with null-safe companyable check
Brady Wetherington2b7ed1f7faa6
diff --git a/app/Models/Traits/CompanyableTrait.php b/app/Models/Traits/CompanyableTrait.phpindex 30d76b6739..9de39ec9a2 100644--- a/app/Models/Traits/CompanyableTrait.php+++ b/app/Models/Traits/CompanyableTrait.php@@ -20,7 +20,7 @@ trait CompanyableTraitif (__CLASS__ != 'App\Models\Location') {static::addGlobalScope(new CompanyableScope);} else {- if (Setting::getSettings()->scope_locations_fmcs == 1) {+ if (Setting::getSettings()?->scope_locations_fmcs == 1) {static::addGlobalScope(new CompanyableScope);}}diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.phpindex 16611f121d..146c8859ce 100644--- a/app/Providers/AppServiceProvider.php+++ b/app/Providers/AppServiceProvider.php@@ -75,7 +75,7 @@ class AppServiceProvider extends ServiceProviderComponent::observe(ComponentObserver::class);Consumable::observe(ConsumableObserver::class);License::observe(LicenseObserver::class);- // Location::observe(LocationObserver::class);+ Location::observe(LocationObserver::class);Maintenance::observe(MaintenanceObserver::class);Setting::observe(SettingObserver::class);User::observe(UserObserver::class);