diff --git a/app/Http/Controllers/Bo/TicketController.php b/app/Http/Controllers/Bo/TicketController.php index 827c39d..cc59f0d 100644 --- a/app/Http/Controllers/Bo/TicketController.php +++ b/app/Http/Controllers/Bo/TicketController.php @@ -762,13 +762,15 @@ class TicketController extends Controller $description = \sprintf("%s
", $ticket->text); $cLabel = match ($ticket->type) { TicketTypeEnum::bug => 'c-bug,g-to-dispatch', - TicketTypeEnum::evolution => 'c-feature', + TicketTypeEnum::evolution, + TicketTypeEnum::mailing => 'c-feature', TicketTypeEnum::newsletter => 'c-feature,g-to-estimate', }; $assigneeId = match ($ticket->type) { TicketTypeEnum::bug => $userGitlabId, TicketTypeEnum::evolution, + TicketTypeEnum::mailing, TicketTypeEnum::newsletter => $ticket->site->projectManager?->gitlab_id }; diff --git a/app/Policies/TicketPolicy.php b/app/Policies/TicketPolicy.php index eae3a92..89a6189 100644 --- a/app/Policies/TicketPolicy.php +++ b/app/Policies/TicketPolicy.php @@ -287,7 +287,8 @@ class TicketPolicy $ticket->type->equals(TicketTypeEnum::bug) || $ticket->type->equals(TicketTypeEnum::evolution) || $ticket->type->equals(TicketTypeEnum::newsletter) - ) + || $ticket->type->equals(TicketTypeEnum::mailing) + ) && !\is_null($ticket->site->gitlab_project_id) && \is_null($ticket->gitlab_issue); }