From 609bf8e66f1ee7ac16554b728bbfc6eeb6aa2262 Mon Sep 17 00:00:00 2001 From: Lupu Gheorghe Date: Wed, 14 Feb 2024 14:26:54 +0200 Subject: [PATCH] fix register logic and user show tabel --- app/Enums/OrganizationStatus.php | 1 - .../UserResource/RelationManagers/ProjectsRelationManager.php | 3 +-- app/Http/Controllers/Auth/RegisteredUserController.php | 2 +- app/Models/User.php | 2 +- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/Enums/OrganizationStatus.php b/app/Enums/OrganizationStatus.php index eb8eecb4..e3167dae 100644 --- a/app/Enums/OrganizationStatus.php +++ b/app/Enums/OrganizationStatus.php @@ -14,7 +14,6 @@ enum OrganizationStatus: string use Comparable; use HasLabel; - case draft = 'draft'; case pending = 'pending'; case approved = 'approved'; case rejected = 'rejected'; diff --git a/app/Filament/Resources/UserResource/RelationManagers/ProjectsRelationManager.php b/app/Filament/Resources/UserResource/RelationManagers/ProjectsRelationManager.php index 75c3b29b..fb5ee1d0 100644 --- a/app/Filament/Resources/UserResource/RelationManagers/ProjectsRelationManager.php +++ b/app/Filament/Resources/UserResource/RelationManagers/ProjectsRelationManager.php @@ -5,7 +5,6 @@ namespace App\Filament\Resources\UserResource\RelationManagers; use Filament\Forms\Components\TextInput; -use Filament\Pages\Actions\ViewAction; use Filament\Resources\Form; use Filament\Resources\RelationManagers\RelationManager; use Filament\Resources\Table; @@ -64,7 +63,7 @@ public static function table(Table $table): Table ->headerActions([ ]) ->actions([ - ViewAction::make(), + Tables\Actions\ViewAction::make(), Tables\Actions\DeleteAction::make(), ]) ->bulkActions([ diff --git a/app/Http/Controllers/Auth/RegisteredUserController.php b/app/Http/Controllers/Auth/RegisteredUserController.php index d9fe937e..662d1216 100644 --- a/app/Http/Controllers/Auth/RegisteredUserController.php +++ b/app/Http/Controllers/Auth/RegisteredUserController.php @@ -54,7 +54,7 @@ public function store(RegistrationRequest $request): RedirectResponse event(new Registered($user)); if ($user->hasRole(UserRole::ADMIN)) { - $attributes['ngo']['status'] = OrganizationStatus::draft; + $attributes['ngo']['status'] = OrganizationStatus::pending; $attributes['ngo']['slug'] = Str::slug($attributes['ngo']['name']); $organization = Organization::create($attributes['ngo']); diff --git a/app/Models/User.php b/app/Models/User.php index ff24b3fd..504d88a2 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -84,7 +84,7 @@ public function donations(): HasMany public function projects(): HasMany { - return $this->organization->projects()->with('organization'); + return $this->organization?->projects()->with('organization'); } public function canAccessFilament(): bool