holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* CalDAV/CardDAV: allow removing categories

Browse Source
This commit is contained in:
Ralf Becker 2019-05-28 18:47:55 +02:00
parent ffa1102687
commit 75403eea94
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addressbook/inc/class.addressbook_groupdav.inc.php
View File

@ -628,7 +628,7 @@ class addressbook_groupdav extends Api\CalDAV\Handler
} }
elseif ($contactId > 0) elseif ($contactId > 0)
{ {
$contact['cat_id'] = $oldContact['cat_id']; $contact['cat_id'] = null;
} }
if (is_array($oldContact)) if (is_array($oldContact))
{ {

2
calendar/inc/class.calendar_ical.inc.php
View File

@ -1343,7 +1343,7 @@ class calendar_ical extends calendar_boupdate
else else
{ {
// no merge // no merge
if(!isset($this->supportedFields['category']) || !isset($event['category'])) if(!isset($this->supportedFields['category']))
{ {
$event['category'] = $event_info['stored_event']['category']; $event['category'] = $event_info['stored_event']['category'];
} }

2
infolog/inc/class.infolog_ical.inc.php
View File

@ -712,7 +712,7 @@ class infolog_ical extends infolog_bo
continue; continue;
} }
$taskData = array(); $taskData = array('info_cat' => $_taskID ? 0 : $GLOBALS['egw_info']['user']['preferences']['infolog']['cat_add_default']);
if ($_taskID > 0) if ($_taskID > 0)
{ {