Skip to content

Commit

Permalink
Merge branch 'hotfix/0.24.3' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
polosson committed May 23, 2024
2 parents fad8ee8 + 8013b66 commit 0a21e4d
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 2 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ Tous les changements notables sur le projet sont documentés dans ce fichier.

Ce projet adhère au principe du [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## 0.24.3 (2024-05-23)

- Résolution d'un problème de suppression des assignations des techniciens lorsque la
nouvelle période ne permet plus de garantir au moins une assignation.
- Utilise la valeur de la configuration d'email `from` pour le champ `reply-to` lors de l'envoi des e-mails avec Loxya.

## 0.24.2 (2024-05-22)

- Rétablit l'information du parc, qui avait disparu de la fiche matériel.
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.24.2
0.24.3
2 changes: 1 addition & 1 deletion server/src/App/Models/Event.php
Original file line number Diff line number Diff line change
Expand Up @@ -1968,7 +1968,7 @@ static function ($assignments, $oldAssignment) use ($assignationPeriod) {
[],
);
}
if ($technicians) {
if ($technicians !== null) {
$event->syncTechnicians($technicians);
}

Expand Down
5 changes: 5 additions & 0 deletions server/src/App/Services/Mailer.php
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,13 @@ private function _sendWithLoxya(
string $message,
?array $attachments = null,
): void {
if (!$this->fromEmail) {
throw new \Exception("Cannot send message with Loxya: missing 'from:' e-mail address.");
}

$data = [
'instanceId' => Config::get('instanceId'),
'replyTo' => $this->fromEmail,
'recipients' => $recipients,
'subject' => $subject,
'content' => $message,
Expand Down

0 comments on commit 0a21e4d

Please sign in to comment.