Skip to content
Snippets Groups Projects

[RTKO] default volatile on setupOpac

Merged Sebastien ANDRE requested to merge fix_default_volatile_on_setup into master
Compare and Show latest version
3 files
+ 18
15
Preferences
Compare changes
Files
3
@@ -20,7 +20,7 @@
*/
class Class_DigitalResource extends Class_Entity
class Class_DigitalResource
{
use Trait_StormFileSystem;
@@ -28,7 +28,7 @@ class Class_DigitalResource extends Class_Entity
protected static $_instance;
protected ?array $_batches = null;
public static function getInstance()
public static function getInstance(): self
{
if ( ! static::$_instance)
static::$_instance = new static;
@@ -94,10 +94,10 @@ class Class_DigitalResource extends Class_Entity
}
public function enablePluginWith(string $admin_var)
public function enablePluginWith(string $admin_var): ?Class_DigitalResource_Config
{
if ( ! $config = $this->getConfigWith($admin_var))
return $this;
return null;
return $config->enablePlugin();
}
@@ -212,19 +212,13 @@ class Class_DigitalResource extends Class_Entity
}
public function hasRightAccessPlugin($plugin, $user): bool
public function hasRightAccessPlugin(string $plugin, Class_Users $user): bool
{
if ( ! $this->isPluginDocType($plugin))
return false;
if ( ! $this->hasPermissionOn($plugin, $user))
return false;
return true;
return $this->isPluginDocType($plugin) && $this->hasPermissionOn($plugin, $user);
}
public function hasPermissionOn($plugin, $user): bool
public function hasPermissionOn(string $plugin, Class_Users $user): bool
{
if ( ! $config = $this->configFor($plugin))
return false;