From 3f17c87b512fe38b9149579223845de97e9119c5 Mon Sep 17 00:00:00 2001 From: Yuriy Bakhtin Date: Fri, 26 Jan 2024 16:07:46 +0100 Subject: [PATCH] Extend list of fields for updating of sequence --- docs/CHANGELOG.md | 1 + models/forms/CalendarEntryForm.php | 26 ++++++++++++++++++-------- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 23540383..1529cd44 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -5,6 +5,7 @@ Changelog ------------------------ - Fix #443: Fix email subject on invite/add users - Fix #447: Global calendar header redesign +- Enh #440: Extend list of fields for updating of sequence 1.5.8 (January 19, 2024) ------------------------ diff --git a/models/forms/CalendarEntryForm.php b/models/forms/CalendarEntryForm.php index 413f6697..6e1dc5da 100644 --- a/models/forms/CalendarEntryForm.php +++ b/models/forms/CalendarEntryForm.php @@ -508,17 +508,27 @@ public function save() public function sequenceCheck() { - if(!$this->original) { + if (!$this->original) { return; } - $incrementSequence = $this->original->getStartDateTime() != $this->entry->getStartDateTime(); - $incrementSequence = $incrementSequence || $this->original->getEndDateTime() != $this->entry->getEndDateTime(); - $incrementSequence = $incrementSequence || $this->original->getRrule() !== $this->entry->getRrule(); - $incrementSequence = $incrementSequence || $this->original->getExdate() !== $this->entry->getExdate(); - $incrementSequence = $incrementSequence || $this->original->getEventStatus() !== $this->entry->getEventStatus(); - - if($incrementSequence) { + if ($this->original->getTitle() !== $this->entry->getTitle() || + $this->original->getDescription() !== $this->entry->getDescription() || + $this->original->getStartDateTime() != $this->entry->getStartDateTime() || + $this->original->getEndDateTime() != $this->entry->getEndDateTime() || + $this->original->isAllDay() !== $this->entry->isAllDay() || + $this->original->participation_mode !== $this->entry->participation_mode || + $this->original->getColor() !== $this->entry->getColor() || + $this->original->allow_decline !== $this->entry->allow_decline || + $this->original->allow_maybe !== $this->entry->allow_maybe || + $this->original->getTimezone() !== $this->entry->getTimezone() || + $this->original->participant_info !== $this->entry->participant_info || + $this->original->getEventStatus() !== $this->entry->getEventStatus() || + $this->original->max_participants !== $this->entry->max_participants || + $this->original->getRrule() !== $this->entry->getRrule() || + $this->original->getExdate() !== $this->entry->getExdate() || + $this->original->getLocation() !== $this->entry->getLocation() + ) { CalendarUtils::incrementSequence($this->entry); $this->entry->saveEvent(); }