Load currentTeam using setRelation (#708)

laravel · Mar 17, 2021 · 8028279 · 8028279
1 parent 5f007c5
commit 8028279
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/Http/Middleware/ShareInertiaData.php b/src/Http/Middleware/ShareInertiaData.php
@@ -42,7 +42,9 @@ public function handle($request, $next)
                 }
 
                 if (Jetstream::hasTeamFeatures() && $request->user()) {
-                    $request->user()->currentTeam;
+                    $request->user()->setRelation('currentTeam', $request->user()->allTeams()->filter(function ($team) use ($request) {
+                        return $team->id === $request->user()->current_team_id;
+                    })->first());
                 }
 
                 return array_merge($request->user()->toArray(), array_filter([