DEleted function in request and changed the way the controller uses it,
linter / quality (pull_request) Successful in 1m13s
tests / ci (8.4) (pull_request) Failing after 1m15s

This commit is contained in:
Eric Peters
2026-04-03 16:50:00 +02:00
parent 2c1a0cbff3
commit 1c355c20b4
27 changed files with 285 additions and 263 deletions
@@ -14,6 +14,7 @@ use App\Models\TicketLink;
use App\Models\User;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Arr;
use Inertia\Inertia;
use Inertia\Response;
@@ -29,15 +30,17 @@ class ProjectTicketController extends Controller
public function show(Request $request, Project $project, Ticket $ticket): Response
{
$user = $request->user();
abort_unless(
$this->projectPermissionService->userCanViewProject($request->user(), $project),
$this->projectPermissionService->userCanViewProject($user, $project),
403,
);
$excludedParentIds = [$ticket->id, ...$this->descendantIds($ticket)];
return Inertia::render('projects/Ticket', [
'canEditTicket' => $this->projectPermissionService->userHasPermission($request->user(), $project, 'edit'),
'canEditTicket' => $this->projectPermissionService->userHasPermission($user, $project, 'edit'),
'childTicketTree' => $this->buildChildTicketTree($ticket),
'linkedTickets' => $this->linkedTickets($ticket),
'parentTicketOptions' => Ticket::query()
@@ -53,12 +56,12 @@ class ProjectTicketController extends Controller
]),
'project' => $project,
'repositoryBranches' => $this->resolveTicketBranchMatches->handle(
$request->user(),
$user,
$project,
$ticket,
),
'repositoryPullRequests' => $this->resolveTicketPullRequestMatches->handle(
$request->user(),
$user,
$project,
$ticket,
),
@@ -97,16 +100,22 @@ class ProjectTicketController extends Controller
Project $project,
Ticket $ticket,
): RedirectResponse {
$user = $request->user();
abort_unless(
$this->projectPermissionService->userHasPermission($request->user(), $project, 'edit'),
$this->projectPermissionService->userHasPermission($user, $project, 'edit'),
403,
);
$validated = $request->validated();
$fieldValues = Arr::get($validated, 'field_values');
$ticketAttributes = $request->ticketAttributes();
$wasUpdated = $this->updateProjectTicket->handle(
$ticket,
$request->user(),
$request->ticketAttributes(),
$request->fieldValues(),
$user,
$ticketAttributes,
$fieldValues,
);
$statusMessage = $wasUpdated