Uh oh!
There was an error while loading. Please reload this page.
Include more information in iMIP email and show diff information on updating an event - #35743
Conversation
miaulalala
commented
Dec 12, 2022
/backport to stable25 |
miaulalala
commented
Dec 12, 2022
/backport to stable24 |
miaulalala
commented
Dec 12, 2022
/backport to stable23 |
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
unfortunately, the approach with just the reccurence-id doesn't work correctly if I first update a single recurrence and then the whole instance. |
Uh oh!
There was an error while loading. Please reload this page.
| $this->userManager = $userManager; | ||
| } | ||
| public function initialize(DAV\Server $server) { |
Check notice
Code scanning / Psalm
MissingReturnType
| * @param resource $data data | ||
| * @param bool $modified modified | ||
| */ | ||
| public function beforeWriteContent($uri, INode $node, $data, $modified) { |
Check notice
Code scanning / Psalm
MissingReturnType
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
VEVENT to build iMip emailUh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
| // No changed events after all - this shouldn't happen if there is significant change yet here we are | ||
| // The scheduling status is debatable | ||
| // @todo handle this error case | ||
| if(!is_array($newEventComponents) || empty($newEventComponents)) { |
Check notice
Code scanning / Psalm
DocblockTypeContradiction
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Psalm found more than 10 potential problems in the proposed changes. Check the Files changed tab for more details.
miaulalala
commented
Jan 30, 2023
I had a look, it's not in there yet. Will have to be a followup ticket due to time constraints this week. Sorry @onny |
a39a850 to
ca4728cCompared5fd00b to
37e1141Compareinstead of the main VEVENT of a repeating event Fixes part of nextcloud/calendar#3919 Signed-off-by: Anna Larch <anna@nextcloud.com>
37e1141 to
38e9cb6CompareThe backport to stable25 failed. Please do this backport manually. # Switch to the target branch and update it
git checkout stable25
git pull origin/stable25
# Create the new backport branch
git checkout -b fix/foo-stable25
# Cherry pick the change from the commit sha1 of the change against the default branch# This might cause conflicts. Resolve them.
git cherry-pick abc123
# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable25More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport |
The backport to stable24 failed. Please do this backport manually. # Switch to the target branch and update it
git checkout stable24
git pull origin/stable24
# Create the new backport branch
git checkout -b fix/foo-stable24
# Cherry pick the change from the commit sha1 of the change against the default branch# This might cause conflicts. Resolve them.
git cherry-pick abc123
# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable24More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport |
The backport to stable23 failed. Please do this backport manually. # Switch to the target branch and update it
git checkout stable23
git pull origin/stable23
# Create the new backport branch
git checkout -b fix/foo-stable23
# Cherry pick the change from the commit sha1 of the change against the default branch# This might cause conflicts. Resolve them.
git cherry-pick abc123
# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable23More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport |
miaulalala
commented
Feb 6, 2023
/backport to stable25 |
miaulalala
commented
Feb 6, 2023
/backport to stable24 |
The backport to stable25 failed. Please do this backport manually. # Switch to the target branch and update it
git checkout stable25
git pull origin/stable25
# Create the new backport branch
git checkout -b fix/foo-stable25
# Cherry pick the change from the commit sha1 of the change against the default branch# This might cause conflicts. Resolve them.
git cherry-pick abc123
# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable25More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport |
The backport to stable24 failed. Please do this backport manually. # Switch to the target branch and update it
git checkout stable24
git pull origin/stable24
# Create the new backport branch
git checkout -b fix/foo-stable24
# Cherry pick the change from the commit sha1 of the change against the default branch# This might cause conflicts. Resolve them.
git cherry-pick abc123
# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable24More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport |
The backport to stable23 failed. Please do this backport manually. # Switch to the target branch and update it
git checkout stable23
git pull origin/stable23
# Create the new backport branch
git checkout -b fix/foo-stable23
# Cherry pick the change from the commit sha1 of the change against the default branch# This might cause conflicts. Resolve them.
git cherry-pick abc123
# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable23More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport |
st3iny
commented
Feb 8, 2023
/backport to stable25 |
st3iny
commented
Feb 8, 2023
/backport to stable24 |
Summary
Instead of taking the date and time of the main recurrence, the changed VEVENT is filtered from the main VCALENDAR event and used to build a diff to accurately represent what changed.
Screenshots to follow
To Do
As discussed with @ChristophWurst:
Testing manually
All events must have at least one attendee to trigger the iMIP logic
Checklist