From 4b026cb7fe8dd1bd19031b7b8b5b2054eeb50a74 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Fri, 16 Sep 2022 15:17:09 +0200 Subject: [PATCH] wait #5448 @1.5 --- src/app/Magic/Models/CubistMagicAbstractModel.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/Magic/Models/CubistMagicAbstractModel.php b/src/app/Magic/Models/CubistMagicAbstractModel.php index 1f3a552..5d2d39c 100644 --- a/src/app/Magic/Models/CubistMagicAbstractModel.php +++ b/src/app/Magic/Models/CubistMagicAbstractModel.php @@ -54,6 +54,7 @@ class CubistMagicAbstractModel extends Model implements HasMedia public $registerMediaConversionsUsingModelInstance = true; protected static $_doctrineTypesMapping = ['int' => 'integer', 'longtext' => 'text']; + protected static $_permissionBase = null; protected $connection = null; protected $primaryKey = 'id'; @@ -952,7 +953,7 @@ class CubistMagicAbstractModel extends Model implements HasMedia if (null === $user) { return false; } - $permission = $this->getOption('permissions', $this->getOption('name')) . ':' . $operation; + $permission = $this->getOption('permissions', static::$_permissionBase ?? $this->getOption('name')) . ':' . $operation; return $user->can($permission); } -- 2.39.5