diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 328b2d96..489a5860 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,6 +1,10 @@ Changelog ========= +1.5.3 (Unreleased) +----------------------- +- Enh #415: Fix recurring event visibility on stream + 1.5.2 (August 11, 2023) ----------------------- - Enh #405: Improve UI of create/edit form on mobile diff --git a/models/CalendarEntry.php b/models/CalendarEntry.php index 5b36a8e9..7a82b37e 100644 --- a/models/CalendarEntry.php +++ b/models/CalendarEntry.php @@ -369,7 +369,8 @@ public function beforeSave($insert) $this->participation->setDefautls(); } - if (RecurrenceHelper::isRecurrentRoot($this)) { + if (RecurrenceHelper::isRecurrentRoot($this) || + (RecurrenceHelper::isRecurrentInstance($this) && $this->content->hidden)) { $this->streamChannel = null; } @@ -933,6 +934,7 @@ public function syncEventData($root, $original = null) { $this->content->created_by = $root->content->created_by; $this->content->visibility = $root->content->visibility; + $this->content->hidden = $root->content->hidden; if (!$original || empty($this->description) || $original->description === $this->description) { $this->description = $root->description; diff --git a/module.json b/module.json index 188d1fc1..f5641ae7 100644 --- a/module.json +++ b/module.json @@ -3,7 +3,7 @@ "name": "Calendar", "description": "Calendar for spaces or user profiles.", "keywords": ["calendar"], - "version": "1.5.2", + "version": "1.5.3", "humhub": { "minVersion": "1.14" },