Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix email notifications for tags #2396

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions app/Domain/Notifications/Services/Notifications.php
Original file line number Diff line number Diff line change
Expand Up @@ -146,10 +146,11 @@ public function processMentions(string $content, string $module, int $moduleId,
$subject = sprintf($this->language->__('text.x_mentioned_you'), $authorName);
$mailer->setSubject($subject);

$emailMessage = $subject;
$emailMessage .= sprintf($this->language->__('text.click_here'), $url);
$emailMessage = $subject . '. ';
$emailMessage .= sprintf('<a href="%s">%s</a>', $url, $this->language->__('text.click_here'));
$mailer->setHtml($emailMessage);
$mailer->sendMail(array($taggedUser), $authorName);
$recipient = $this->userRepository->getUser($taggedUser)['username'];
$mailer->sendMail(array($recipient), $authorName);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion app/Domain/Tickets/Templates/showTicketModal.tpl.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
window.onload = function() {
if (!window.jQuery) {
//It's not a modal
location.href="<?=BASE_URL ?>/tickets/showKanban?showTicketModal=<?php echo $ticket->id; ?>";
location.href="<?=BASE_URL ?>/tickets/showKanban#/tickets/showTicket/<?php echo $ticket->id; ?>";
}
}
</script>
Expand Down
Loading