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
|
public function update(UpdateUserAdminStatusRequest $request, User $user): RedirectResponse
|
||||||
{
|
{
|
||||||
|
$validated = $request->validated();
|
||||||
|
|
||||||
$user->forceFill([
|
$user->is_admin = $validated['is_admin'];
|
||||||
'is_admin' => $request->boolean('is_admin'),
|
$user->save();
|
||||||
])->save();
|
|
||||||
|
|
||||||
$status = $user->is_admin
|
$status = $user->is_admin
|
||||||
? "{$user->name} now has admin access."
|
? "{$user->name} now has admin access."
|
||||||
|
|||||||
@@ -120,11 +120,7 @@ class ProjectController extends Controller
|
|||||||
);
|
);
|
||||||
|
|
||||||
$validated = $request->validated();
|
$validated = $request->validated();
|
||||||
$permissions = collect(Arr::get($validated, 'permissions'))
|
$permissions = Arr::get($validated, 'permissions', []);
|
||||||
->map(fn (mixed $permission): string => (string) $permission)
|
|
||||||
->unique()
|
|
||||||
->values()
|
|
||||||
->all();
|
|
||||||
|
|
||||||
$this->projectPermissionService->syncUserPermissions($project, $user, $permissions);
|
$this->projectPermissionService->syncUserPermissions($project, $user, $permissions);
|
||||||
|
|
||||||
@@ -143,11 +139,7 @@ class ProjectController extends Controller
|
|||||||
);
|
);
|
||||||
|
|
||||||
$validated = $request->validated();
|
$validated = $request->validated();
|
||||||
$permissions = collect(Arr::get($validated, 'permissions'))
|
$permissions = Arr::get($validated, 'permissions', []);
|
||||||
->map(fn (mixed $permission): string => (string) $permission)
|
|
||||||
->unique()
|
|
||||||
->values()
|
|
||||||
->all();
|
|
||||||
|
|
||||||
$this->projectPermissionService->syncTeamPermissions($project, $team, $permissions);
|
$this->projectPermissionService->syncTeamPermissions($project, $team, $permissions);
|
||||||
|
|
||||||
|
|||||||
@@ -23,11 +23,9 @@ class GitConnectionController extends Controller
|
|||||||
|
|
||||||
public function edit(Request $request): Response
|
public function edit(Request $request): Response
|
||||||
{
|
{
|
||||||
$user = $request->user();
|
|
||||||
$session = $request->session();
|
|
||||||
|
|
||||||
return Inertia::render('settings/GitConnections', [
|
return Inertia::render('settings/GitConnections', [
|
||||||
'gitConnections' => $user->gitConnections
|
'gitConnections' => $request->user()->gitConnections
|
||||||
->map(fn (UserGitConnection $gitConnection): array => [
|
->map(fn (UserGitConnection $gitConnection): array => [
|
||||||
'account_login' => $gitConnection->account_login,
|
'account_login' => $gitConnection->account_login,
|
||||||
'account_name' => $gitConnection->account_name,
|
'account_name' => $gitConnection->account_name,
|
||||||
@@ -41,7 +39,7 @@ class GitConnectionController extends Controller
|
|||||||
'user_id' => $gitConnection->user_id,
|
'user_id' => $gitConnection->user_id,
|
||||||
])
|
])
|
||||||
->values(),
|
->values(),
|
||||||
'status' => $session->get('status'),
|
'status' => $request->session()->get('status'),
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -51,7 +49,7 @@ class GitConnectionController extends Controller
|
|||||||
|
|
||||||
$apiToken = Arr::get($validated, 'api_token');
|
$apiToken = Arr::get($validated, 'api_token');
|
||||||
$baseUrl = Arr::get($validated, 'base_url');
|
$baseUrl = Arr::get($validated, 'base_url');
|
||||||
$provider = GitProviderKey::from((string) Arr::get($validated, 'provider'));
|
$provider = GitProviderKey::from(Arr::get($validated, 'provider'));
|
||||||
$user = $request->user();
|
$user = $request->user();
|
||||||
|
|
||||||
|
|
||||||
@@ -91,7 +89,7 @@ class GitConnectionController extends Controller
|
|||||||
$validated = $request->validated();
|
$validated = $request->validated();
|
||||||
$apiToken = Arr::get($validated, 'api_token');
|
$apiToken = Arr::get($validated, 'api_token');
|
||||||
$baseUrl = Arr::get($validated, 'base_url');
|
$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();
|
$validated = $request->validated();
|
||||||
|
|
||||||
$userIds = collect(Arr::get($validated, 'user_ids', []))
|
$userIds = Arr::get($validated, 'user_ids', []);
|
||||||
->map(fn (mixed $userId): int => (int) $userId)
|
|
||||||
->unique()
|
|
||||||
->values()
|
|
||||||
->all();
|
|
||||||
|
|
||||||
$this->projectPermissionService->syncTeamMembers($team, $userIds);
|
$this->projectPermissionService->syncTeamMembers($team, $userIds);
|
||||||
|
|
||||||
|
|||||||
@@ -28,6 +28,7 @@ class SyncProjectPermissionsRequest extends FormRequest
|
|||||||
'permissions' => ['nullable', 'array'],
|
'permissions' => ['nullable', 'array'],
|
||||||
'permissions.*' => [
|
'permissions.*' => [
|
||||||
'string',
|
'string',
|
||||||
|
'distinct',
|
||||||
Rule::in(ProjectPermissionService::permissions()),
|
Rule::in(ProjectPermissionService::permissions()),
|
||||||
],
|
],
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -174,14 +174,6 @@ class UpdateProjectTicketRequest extends FormRequest
|
|||||||
return $attributes;
|
return $attributes;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @return array<int, array{
|
|
||||||
* ticket_field_definition_id: int,
|
|
||||||
* value_number?: float|int|string|null,
|
|
||||||
* value_user_id?: int|string|null
|
|
||||||
* }>
|
|
||||||
*/
|
|
||||||
|
|
||||||
private function createsCycle(Ticket $ticket, Ticket $candidateParent): bool
|
private function createsCycle(Ticket $ticket, Ticket $candidateParent): bool
|
||||||
{
|
{
|
||||||
$currentParent = $candidateParent;
|
$currentParent = $candidateParent;
|
||||||
|
|||||||
@@ -29,7 +29,4 @@ class UpdateTeamMembersRequest extends FormRequest
|
|||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @return array<int, int>
|
|
||||||
*/
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user