diff --git a/app/Filament/Resources/Users/RelationManagers/ContractsRelationManager.php b/app/Filament/Resources/Users/RelationManagers/ContractsRelationManager.php index 958170e..1d2a8a8 100644 --- a/app/Filament/Resources/Users/RelationManagers/ContractsRelationManager.php +++ b/app/Filament/Resources/Users/RelationManagers/ContractsRelationManager.php @@ -20,6 +20,8 @@ use Filament\Tables\Table; class ContractsRelationManager extends RelationManager { protected static string $relationship = 'contracts'; + protected static ?string $title = "Contracts Associate/Disassociate"; + protected static ?string $inverseRelationship = 'contractable'; public function form(Schema $schema): Schema { @@ -68,7 +70,7 @@ class ContractsRelationManager extends RelationManager ]) ->headerActions([ CreateAction::make(), - AssociateAction::make()->preloadRecordSelect(), + AssociateAction::make(), ]) ->recordActions([ EditAction::make(), diff --git a/app/Filament/Resources/Users/Schemas/UserForm.php b/app/Filament/Resources/Users/Schemas/UserForm.php index a2b16c5..286bb1e 100644 --- a/app/Filament/Resources/Users/Schemas/UserForm.php +++ b/app/Filament/Resources/Users/Schemas/UserForm.php @@ -21,7 +21,8 @@ class UserForm DateTimePicker::make('email_verified_at'), TextInput::make('password') ->password() - ->required(), + ->required() + ->visibleOn('create'), ]); } } diff --git a/app/Filament/Resources/Users/UserResource.php b/app/Filament/Resources/Users/UserResource.php index 466e090..7a42c35 100644 --- a/app/Filament/Resources/Users/UserResource.php +++ b/app/Filament/Resources/Users/UserResource.php @@ -6,7 +6,6 @@ use App\Filament\Resources\Users\Pages\CreateUser; use App\Filament\Resources\Users\Pages\EditUser; use App\Filament\Resources\Users\Pages\ListUsers; use App\Filament\Resources\Users\RelationManagers\ContractsRelationManager; -use App\Filament\Resources\Users\RelationManagers\DocumentsRelationManager; use App\Filament\Resources\Users\Schemas\UserForm; use App\Filament\Resources\Users\Tables\UsersTable; use App\Models\User; diff --git a/app/Models/User.php b/app/Models/User.php index 3d341f4..5756a05 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -6,9 +6,7 @@ namespace App\Models; use App\HasContactgroups; use App\HasContracts; -use App\HasDocuments; use Illuminate\Database\Eloquent\Factories\HasFactory; -use Illuminate\Database\Eloquent\Relations\MorphMany; use Illuminate\Foundation\Auth\User as Authenticatable; use Illuminate\Notifications\Notifiable; @@ -17,11 +15,8 @@ class User extends Authenticatable /** @use HasFactory<\Database\Factories\UserFactory> */ use HasFactory, Notifiable; use HasContactgroups; + use HasContracts; - public function contracts(): MorphMany - { - return $this->morphMany(Contract::class, 'contractable'); - } /** * The attributes that are mass assignable. *