extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-14 18:08:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge calendar events into user account if there is one over user contact

Browse Source
This commit is contained in:
nathangray 2017-10-26 09:16:02 +02:00
parent 66738e21c3
commit fdb47ab168
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/src/Contacts.php
View File

@ -1929,7 +1929,7 @@ class Contacts extends Contacts\Storage
} }
} }
// Update calendar // Update calendar
$this->merge_calendar($contact['id'], $target['id']); $this->merge_calendar('c'.$contact['id'], $target['account_id'] ? 'u'.$target['account_id'] : 'c'.$target['id']);
if ($this->delete($contact['id'])) $success++; if ($this->delete($contact['id'])) $success++;
} }
@ -1952,12 +1952,12 @@ class Contacts extends Contacts\Storage
} }
// Find all events with this contact // Find all events with this contact
$events = $bo->search(array('users' => "c$old_id", 'ignore_acl' => true)); $events = $bo->search(array('users' => $old_id, 'ignore_acl' => true));
foreach($events as $event) foreach($events as $event)
{ {
$event['participants']["c$new_id"] = $event['participants']["c$old_id"]; $event['participants'][$new_id] = $event['participants'][$old_id];
unset($event['participants']["c$old_id"]); unset($event['participants'][$old_id]);
// Quietly update, ignoring ACL & no notifications // Quietly update, ignoring ACL & no notifications
$bo->update($event, true, true, true, true, $messages, true); $bo->update($event, true, true, true, true, $messages, true);