fix register logic and user show tabel

code4romania · Feb 14, 2024 · 609bf8e · 609bf8e
1 parent 1124fa2
commit 609bf8e
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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