Skip to content

Commit 22b2f8e

Browse files
committed
feat: remove changes in database cc and bcc logic
1 parent 4bbede1 commit 22b2f8e

File tree

4 files changed

+17
-26
lines changed

4 files changed

+17
-26
lines changed

src/Content/MailArchive/MailArchiveEntity.php

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,13 @@ public function getReceiver(): array
8989
return $this->receiver;
9090
}
9191

92+
/**
93+
* @param array<string, string> $receiver
94+
*/
95+
public function setReceiver(array $receiver): void
96+
{
97+
$this->receiver = $receiver;
98+
}
9299

93100
public function getSubject(): string
94101
{
@@ -100,14 +107,6 @@ public function setSubject(string $subject): void
100107
$this->subject = $subject;
101108
}
102109

103-
/**
104-
* @param array<string, string> $receiver
105-
*/
106-
public function setReceiver(array $receiver): void
107-
{
108-
$this->receiver = $receiver;
109-
}
110-
111110
public function getPlainText(): ?string
112111
{
113112
return $this->plainText;

src/Controller/Api/MailArchiveController.php

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -273,14 +273,6 @@ private function enrichFromDatabase(MailArchiveEntity $mailArchive, Email $email
273273
$email->from(new Address($mail, $name));
274274
}
275275

276-
foreach ($mailArchive->getCc() as $mail => $name) {
277-
$email->cc(new Address($mail, $name));
278-
}
279-
280-
foreach ($mailArchive->getBcc() as $mail => $name) {
281-
$email->bcc(new Address($mail, $name));
282-
}
283-
284276
$email->subject($mailArchive->getSubject());
285277

286278
$email->html($mailArchive->getHtmlText());

src/Resources/app/administration/src/module/frosh-mail-archive/page/frosh-mail-archive-detail/frosh-mail-archive-detail.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
>
3636
<sw-description-list>
3737
<dt>{{ $tc('frosh-mail-archive.detail.metadata.receiver') }}</dt>
38-
<dd>{{ jsonToTextConcat('receiver') }}</dd>
38+
<dd>{{ receiverText }}</dd>
3939
</sw-description-list>
4040
<sw-description-list>
4141
<dt>{{ $tc('frosh-mail-archive.detail.metadata.sender') }}</dt>

src/Resources/app/administration/src/module/frosh-mail-archive/page/frosh-mail-archive-detail/index.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,15 @@ Component.register('frosh-mail-archive-detail', {
5858

5959
return new Intl.DateTimeFormat(locale, options).format(new Date(this.archive.createdAt));
6060
},
61+
receiverText() {
62+
let text = [];
63+
64+
Object.keys(this.archive.receiver).forEach(key => {
65+
text.push(`${this.archive.receiver[key]} <${key}>`);
66+
});
67+
68+
return text.join(',');
69+
},
6170
senderText() {
6271
let text = [];
6372

@@ -95,15 +104,6 @@ Component.register('frosh-mail-archive-detail', {
95104
},
96105

97106
methods: {
98-
jsonToTextConcat(field) {
99-
let text = [];
100-
101-
Object.keys(this.archive[field]).forEach(key => {
102-
text.push(`${this.archive[field][key]} <${key}>`);
103-
});
104-
105-
return text.join(',');
106-
},
107107
loadMail() {
108108
const criteria = new Criteria();
109109
criteria.addAssociation('attachments');

0 commit comments

Comments
 (0)