Skip to content

Commit

Permalink
Merge branch 'vipin-shrivastava-master' into 1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Sanjeev Papnoi committed Oct 27, 2021
2 parents 6d1c5d4 + e9e0f7c commit 7b90478
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 0 deletions.
3 changes: 3 additions & 0 deletions Controller/Ticket.php
Original file line number Diff line number Diff line change
Expand Up @@ -441,12 +441,15 @@ public function ticketView($id, Request $request)
$entityManager->persist($ticket);
$entityManager->flush();
}

$checkTicket = $entityManager->getRepository('UVDeskCoreFrameworkBundle:Ticket')->isTicketCollaborator($ticket, $user->getEmail());

$twigResponse = [
'ticket' => $ticket,
'searchDisable' => true,
'initialThread' => $this->ticketService->getTicketInitialThreadDetails($ticket),
'localizedCreateAtTime' => $this->userService->getLocalizedFormattedTime($user, $ticket->getCreatedAt()),
'isCollaborator' => $checkTicket,
];

return $this->render('@UVDeskSupportCenter/Knowledgebase/ticketView.html.twig', $twigResponse);
Expand Down
2 changes: 2 additions & 0 deletions Resources/views/Knowledgebase/ticketView.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -351,13 +351,15 @@
</div>

<div class="uv-element-block cc-bcc">
{% if isCollaborator != true %}
<label>
<div class="uv-checkbox">
<input type="checkbox" class="cc-bcc-toggle">
<span class="uv-checkbox-view"></span>
</div>
<span class="uv-checkbox-label">{{ 'CC/BCC'|trans }}</span>
</label>
{% endif %}
<div class="uv-field-block" style="display: none">
<div class="uv-group">
<input class="uv-group-field" type="text">
Expand Down

0 comments on commit 7b90478

Please sign in to comment.