Skip to content

Commit

Permalink
Merge branch '1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
Sanjeev Papnoi committed Oct 8, 2020
2 parents 5df88dc + 05973b6 commit 2d7626d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Controller/Thread.php
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ public function saveThread($ticketId, Request $request)
$this->eventDispatcher->dispatch('uvdesk.automation.workflow.execute', $event);

// @TODO: Render response on the basis of event response (if propogation was stopped or not)
$this->addFlash('success', $this->translator->trans('Reply added to ticket successfully.'));
$this->addFlash('success', $this->get('translator')->trans('Success ! Reply added successfully.'));
break;
case 'forward':
// Prepare headers
Expand Down
4 changes: 2 additions & 2 deletions Resources/views/ticket.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -462,13 +462,13 @@
<label>{{ 'Status'|trans }}</label>
<ul class="status" data-action="status">
{% for status in ticketStatusCollection %}
<li data-index="{{ status.id }}"><a href="#">{{ status.description }}</a></li>
<li data-index="{{ status.id }}"><a href="#">{{ status.description|trans }}</a></li>
{% endfor %}
</ul>
</div>
</div>
{% else %}
<span class="uv-aside-select-value">{{ ticket.status.description }}</span>
<span class="uv-aside-select-value">{{ ticket.status.description|trans }}</span>
{% endif %}
</div>
</div>
Expand Down

0 comments on commit 2d7626d

Please sign in to comment.