Fix recurring event visibility on stream

humhub · Sep 5, 2023 · 0e7e0fd · 0e7e0fd
1 parent c550171
commit 0e7e0fd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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"
     },