From 351faf7cfe90f1b0cb25cc2f189bac264895cb00 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Sat, 2 May 2020 15:13:49 +0300 Subject: [PATCH] fixed composition check #1433 --- app/Abstracts/Model.php | 2 ++ app/Models/Setting/Setting.php | 2 ++ app/Traits/Tenants.php | 2 -- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/Abstracts/Model.php b/app/Abstracts/Model.php index 1f7a73aea..951a5963f 100644 --- a/app/Abstracts/Model.php +++ b/app/Abstracts/Model.php @@ -14,6 +14,8 @@ abstract class Model extends Eloquent { use Cachable, SearchString, SoftDeletes, Sortable, Tenants; + protected $tenantable = true; + protected $dates = ['deleted_at']; /** diff --git a/app/Models/Setting/Setting.php b/app/Models/Setting/Setting.php index 12961c640..0ba333fe1 100644 --- a/app/Models/Setting/Setting.php +++ b/app/Models/Setting/Setting.php @@ -12,6 +12,8 @@ class Setting extends Eloquent protected $table = 'settings'; + protected $tenantable = true; + public $timestamps = false; /** diff --git a/app/Traits/Tenants.php b/app/Traits/Tenants.php index 5a07c3f13..a2dcf0960 100644 --- a/app/Traits/Tenants.php +++ b/app/Traits/Tenants.php @@ -4,8 +4,6 @@ namespace App\Traits; trait Tenants { - protected $tenantable = true; - public function isTenantable() { return (isset($this->tenantable) && ($this->tenantable === true));