opensourcemirror
/
nextcloud-calendar
mirror of https://github.com/nextcloud/calendar.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove duplicate location in booking confirmation email 

Fixes #4681

Signed-off-by: Anna Larch <anna@nextcloud.com>
This commit is contained in:
Anna Larch 2022-10-25 09:25:35 +02:00
parent 1973f32e2d
commit 39cc2c818b
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/Service/Appointments/MailService.php
View File

@ -236,9 +236,6 @@ class MailService {
$template->addBodyListItem($location, $l10n->t('Where:'));
}
if (!empty($location)) {
$template->addBodyListItem($location, $l10n->t('Where:'));
}
if (!empty($booking->getDescription())) {
$template->addBodyListItem($booking->getDescription(), $l10n->t('Your Comment:'));
}

20
tests/php/unit/Service/Appointments/MailServiceTest.php
View File

@ -143,7 +143,7 @@ class MailServiceTest extends TestCase {
->method('setSubject');
$emailTemplate->expects(self::once())
->method('addHeading');
$emailTemplate->expects(self::exactly(6))
$emailTemplate->expects(self::exactly(5))
->method('addBodyListItem');
$emailTemplate->expects(self::once())
->method('addBodyButton');
@ -153,7 +153,7 @@ class MailServiceTest extends TestCase {
->method('addFooter');
$this->mailer->expects(self::once())
->method('createEmailTemplate');
$this->l10n->expects(self::exactly(10))
$this->l10n->expects(self::exactly(9))
->method('t');
$this->lFactory->expects(self::once())
->method('findGenericLanguage')
@ -228,7 +228,7 @@ class MailServiceTest extends TestCase {
->method('setSubject');
$emailTemplate->expects(self::once())
->method('addHeading');
$emailTemplate->expects(self::exactly(6))
$emailTemplate->expects(self::exactly(5))
->method('addBodyListItem');
$emailTemplate->expects(self::once())
->method('addBodyButton');
@ -238,7 +238,7 @@ class MailServiceTest extends TestCase {
->method('addFooter');
$this->mailer->expects(self::once())
->method('createEmailTemplate');
$this->l10n->expects(self::exactly(10))
$this->l10n->expects(self::exactly(9))
->method('t');
$this->lFactory->expects(self::once())
->method('findGenericLanguage')
@ -298,7 +298,7 @@ class MailServiceTest extends TestCase {
->method('setSubject');
$emailTemplate->expects(self::once())
->method('addHeading');
$emailTemplate->expects(self::exactly(6))
$emailTemplate->expects(self::exactly(5))
->method('addBodyListItem');
$emailTemplate->expects(self::once())
->method('addBodyButton');
@ -308,7 +308,7 @@ class MailServiceTest extends TestCase {
->method('addFooter');
$this->mailer->expects(self::once())
->method('createEmailTemplate');
$this->l10n->expects(self::exactly(10))
$this->l10n->expects(self::exactly(9))
->method('t');
$this->lFactory->expects(self::once())
->method('findGenericLanguage')
@ -372,7 +372,7 @@ class MailServiceTest extends TestCase {
->method('setSubject');
$emailTemplate->expects(self::once())
->method('addHeading');
$emailTemplate->expects(self::exactly(6))
$emailTemplate->expects(self::exactly(5))
->method('addBodyListItem');
$emailTemplate->expects(self::once())
->method('addBodyText');
@ -382,7 +382,7 @@ class MailServiceTest extends TestCase {
->method('createEmailTemplate');
$this->mailer->expects(self::once())
->method('createAttachment');
$this->l10n->expects(self::exactly(8))
$this->l10n->expects(self::exactly(7))
->method('t');
$this->lFactory->expects(self::once())
->method('findGenericLanguage')
@ -445,7 +445,7 @@ class MailServiceTest extends TestCase {
->method('setSubject');
$emailTemplate->expects(self::once())
->method('addHeading');
$emailTemplate->expects(self::exactly(6))
$emailTemplate->expects(self::exactly(5))
->method('addBodyListItem');
$emailTemplate->expects(self::once())
->method('addBodyText');
@ -455,7 +455,7 @@ class MailServiceTest extends TestCase {
->method('createEmailTemplate');
$this->mailer->expects(self::once())
->method('createAttachment');
$this->l10n->expects(self::exactly(8))
$this->l10n->expects(self::exactly(7))
->method('t');
$this->lFactory->expects(self::once())
->method('findGenericLanguage')