Merge pull request #729 from laravel/revert-708-2.x

driesvints · web-flow · commit 9f94a2c1bad1 · 2021-03-25T11:39:35.000+01:00
[2.x] Revert "Reduce amount of queries for Teams feature"
diff --git a/src/Http/Middleware/ShareInertiaData.php b/src/Http/Middleware/ShareInertiaData.php
@@ -42,9 +42,7 @@ public function handle($request, $next)
                 }
 
                 if (Jetstream::hasTeamFeatures() && $request->user()) {
-                    $request->user()->setRelation('currentTeam', $request->user()->allTeams()->filter(function ($team) use ($request) {
-                        return $team->id === $request->user()->current_team_id;
-                    })->first());
+                    $request->user()->currentTeam;
                 }
 
                 return array_merge($request->user()->toArray(), array_filter([

Original file line number	Diff line number	Diff line change
`@@ -42,9 +42,7 @@ public function handle($request, $next)`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`if (Jetstream::hasTeamFeatures() && $request->user()) {`
`45`		`- $request->user()->setRelation('currentTeam', $request->user()->allTeams()->filter(function ($team) use ($request) {`
`46`		`- return $team->id === $request->user()->current_team_id;`
`47`		`- })->first());`
	`45`	`+ $request->user()->currentTeam;`
`48`	`46`	`}`
`49`	`47`
`50`	`48`	`return array_merge($request->user()->toArray(), array_filter([`