From 90853dc4838e7f4588e6ca14201be701d3faa599 Mon Sep 17 00:00:00 2001 From: Thomas Zilio Date: Fri, 26 Oct 2018 16:22:47 +0200 Subject: [PATCH] Fix relazioni di base --- src/Models/MailTemplate.php | 2 +- src/Models/Plugin.php | 4 ++-- src/Models/PrintTemplate.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Models/MailTemplate.php b/src/Models/MailTemplate.php index 98c538e20..0e05fcde1 100644 --- a/src/Models/MailTemplate.php +++ b/src/Models/MailTemplate.php @@ -17,7 +17,7 @@ class MailTemplate extends Model $dbo = $database = database(); // Lettura delle variabili del modulo collegato - $variables = include $this->module()->filepath('variables.php'); + $variables = include $this->module->filepath('variables.php'); return (array) $variables; } diff --git a/src/Models/Plugin.php b/src/Models/Plugin.php index 04fd81aae..5ed1aef55 100644 --- a/src/Models/Plugin.php +++ b/src/Models/Plugin.php @@ -42,7 +42,7 @@ class Plugin extends Model */ public function getPermissionAttribute() { - return $this->originalModule()->permission; + return $this->originalModule->permission; } public function getOptionAttribute() @@ -63,7 +63,7 @@ class Plugin extends Model return; } - $directory = 'modules/'.$this->originalModule()->directory.'|custom|/plugins'; + $directory = 'modules/'.$this->originalModule->directory.'|custom|/plugins'; return App::filepath($directory, $this->script); } diff --git a/src/Models/PrintTemplate.php b/src/Models/PrintTemplate.php index 8508993db..6d1de8646 100644 --- a/src/Models/PrintTemplate.php +++ b/src/Models/PrintTemplate.php @@ -26,6 +26,6 @@ class PrintTemplate extends Model public function module() { - return $this->belongsTo(Module::class, 'id_module')->first(); + return $this->belongsTo(Module::class, 'id_module'); } }