From cba6fe5e6fc3e56c915bb0f5b14375373a858257 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Wed, 2 Dec 2020 13:37:06 +0100 Subject: [PATCH] wip #3753 @1 --- src/app/Magic/Models/CubistMagicAbstractModel.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/app/Magic/Models/CubistMagicAbstractModel.php b/src/app/Magic/Models/CubistMagicAbstractModel.php index 0f85f6a..bf1d800 100644 --- a/src/app/Magic/Models/CubistMagicAbstractModel.php +++ b/src/app/Magic/Models/CubistMagicAbstractModel.php @@ -56,7 +56,7 @@ class CubistMagicAbstractModel extends Model implements HasMedia protected $_enableCreation = true; protected $_enableRevisions = true; protected $_enableBulk = true; - protected static $_ownerAttribute = 'owner'; + protected static $_ownerAttribute = null; protected $_syncDbSchema = true; @@ -91,15 +91,13 @@ class CubistMagicAbstractModel extends Model implements HasMedia public static function boot() { parent::boot(); - - static::addGlobalScope('userfilter', function (Builder $builder) { + static::addGlobalScope('ownerclause', function (Builder $builder) { static::addOwnerClause($builder); }); } public static function addOwnerClause(Builder $builder) { - $builder->where(static::$_ownerAttribute, backpack_user()->id); } public function __construct(array $attributes = []) @@ -302,8 +300,8 @@ class CubistMagicAbstractModel extends Model implements HasMedia $cast = $field->getAttribute('cast', false); if ($cast !== false) { if (is_array($cast)) { - foreach ($cast as $name => $type) { - $this->casts[$name] = $type; + foreach ($cast as $n => $t) { + $this->casts[$n] = $t; } } else { $this->casts[$field->getAttribute('name')] = $cast; -- 2.39.5