Merge branch 'pr/349' into develop

This commit is contained in:
Dan Harrin
2021-04-19 09:30:38 +01:00
6 changed files with 12 additions and 14 deletions
@@ -1,6 +1,6 @@
<?php
namespace Filament\Resources\RelationManager\Concerns;
namespace Filament\Resources\Concerns;
trait CanCallHooks
{
+3 -9
View File
@@ -2,11 +2,14 @@
namespace Filament\Resources\Pages;
use Filament\Resources\Concerns\CanCallHooks;
use Filament\Resources\Route;
use Illuminate\Support\Str;
class Page extends \Filament\Pages\Page
{
use CanCallHooks;
public static $resource;
public static function getModel()
@@ -39,13 +42,4 @@ class Page extends \Filament\Pages\Page
abort_unless($this->{$method}() ?? true, 403);
}
protected function callHook($hook)
{
if (! method_exists($this, $hook)) {
return;
}
$this->{$hook}();
}
}
@@ -5,13 +5,14 @@ namespace Filament\Resources\RelationManager;
use Filament\Forms\Components\Select;
use Filament\Forms\Form;
use Filament\Forms\HasForm;
use Filament\Resources\Concerns\CanCallHooks;
use Filament\Resources\Forms\Actions;
use Illuminate\Support\Str;
use Livewire\Component;
class AttachRecord extends Component
{
use Concerns\CanCallHooks;
use CanCallHooks;
use HasForm;
public $manager;
@@ -2,6 +2,7 @@
namespace Filament\Resources\RelationManager;
use Filament\Resources\Concerns\CanCallHooks;
use Filament\Resources\Forms\Actions;
use Filament\Resources\Forms\Form;
use Filament\Resources\Forms\HasForm;
@@ -9,7 +10,7 @@ use Livewire\Component;
class CreateRecord extends Component
{
use Concerns\CanCallHooks;
use CanCallHooks;
use HasForm;
public $manager;
+2 -1
View File
@@ -3,6 +3,7 @@
namespace Filament\Resources\RelationManager;
use Filament\Filament;
use Filament\Resources\Concerns\CanCallHooks;
use Filament\Resources\Forms\Actions;
use Filament\Resources\Forms\Form;
use Filament\Resources\Forms\HasForm;
@@ -10,7 +11,7 @@ use Livewire\Component;
class EditRecord extends Component
{
use Concerns\CanCallHooks;
use CanCallHooks;
use HasForm;
public $manager;
@@ -3,6 +3,7 @@
namespace Filament\Resources\RelationManager;
use Filament\Filament;
use Filament\Resources\Concerns\CanCallHooks;
use Filament\Resources\Tables\HasTable;
use Filament\Resources\Tables\RecordActions;
use Filament\Resources\Tables\Table;
@@ -10,7 +11,7 @@ use Livewire\Component;
class ListRecords extends Component
{
use Concerns\CanCallHooks;
use CanCallHooks;
use HasTable;
public $canAttach;