Changes from the Pull request
This commit is contained in:
@@ -25,10 +25,10 @@ class UserManagementController extends Controller
|
||||
|
||||
public function update(UpdateUserAdminStatusRequest $request, User $user): RedirectResponse
|
||||
{
|
||||
$validated = $request->validated();
|
||||
|
||||
$user->forceFill([
|
||||
'is_admin' => $request->boolean('is_admin'),
|
||||
])->save();
|
||||
$user->is_admin = $validated['is_admin'];
|
||||
$user->save();
|
||||
|
||||
$status = $user->is_admin
|
||||
? "{$user->name} now has admin access."
|
||||
|
||||
@@ -120,11 +120,7 @@ class ProjectController extends Controller
|
||||
);
|
||||
|
||||
$validated = $request->validated();
|
||||
$permissions = collect(Arr::get($validated, 'permissions'))
|
||||
->map(fn (mixed $permission): string => (string) $permission)
|
||||
->unique()
|
||||
->values()
|
||||
->all();
|
||||
$permissions = Arr::get($validated, 'permissions', []);
|
||||
|
||||
$this->projectPermissionService->syncUserPermissions($project, $user, $permissions);
|
||||
|
||||
@@ -143,11 +139,7 @@ class ProjectController extends Controller
|
||||
);
|
||||
|
||||
$validated = $request->validated();
|
||||
$permissions = collect(Arr::get($validated, 'permissions'))
|
||||
->map(fn (mixed $permission): string => (string) $permission)
|
||||
->unique()
|
||||
->values()
|
||||
->all();
|
||||
$permissions = Arr::get($validated, 'permissions', []);
|
||||
|
||||
$this->projectPermissionService->syncTeamPermissions($project, $team, $permissions);
|
||||
|
||||
|
||||
@@ -23,11 +23,9 @@ class GitConnectionController extends Controller
|
||||
|
||||
public function edit(Request $request): Response
|
||||
{
|
||||
$user = $request->user();
|
||||
$session = $request->session();
|
||||
|
||||
return Inertia::render('settings/GitConnections', [
|
||||
'gitConnections' => $user->gitConnections
|
||||
'gitConnections' => $request->user()->gitConnections
|
||||
->map(fn (UserGitConnection $gitConnection): array => [
|
||||
'account_login' => $gitConnection->account_login,
|
||||
'account_name' => $gitConnection->account_name,
|
||||
@@ -41,7 +39,7 @@ class GitConnectionController extends Controller
|
||||
'user_id' => $gitConnection->user_id,
|
||||
])
|
||||
->values(),
|
||||
'status' => $session->get('status'),
|
||||
'status' => $request->session()->get('status'),
|
||||
]);
|
||||
}
|
||||
|
||||
@@ -51,7 +49,7 @@ class GitConnectionController extends Controller
|
||||
|
||||
$apiToken = Arr::get($validated, 'api_token');
|
||||
$baseUrl = Arr::get($validated, 'base_url');
|
||||
$provider = GitProviderKey::from((string) Arr::get($validated, 'provider'));
|
||||
$provider = GitProviderKey::from(Arr::get($validated, 'provider'));
|
||||
$user = $request->user();
|
||||
|
||||
|
||||
@@ -91,7 +89,7 @@ class GitConnectionController extends Controller
|
||||
$validated = $request->validated();
|
||||
$apiToken = Arr::get($validated, 'api_token');
|
||||
$baseUrl = Arr::get($validated, 'base_url');
|
||||
$provider = GitProviderKey::from((string) Arr::get($validated, 'provider'));
|
||||
$provider = GitProviderKey::from(Arr::get($validated, 'provider'));
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -52,11 +52,7 @@ class TeamController extends Controller
|
||||
{
|
||||
$validated = $request->validated();
|
||||
|
||||
$userIds = collect(Arr::get($validated, 'user_ids', []))
|
||||
->map(fn (mixed $userId): int => (int) $userId)
|
||||
->unique()
|
||||
->values()
|
||||
->all();
|
||||
$userIds = Arr::get($validated, 'user_ids', []);
|
||||
|
||||
$this->projectPermissionService->syncTeamMembers($team, $userIds);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user