extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-28 10:53:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Calendar/Addressbook/InfoLog: no longer allow to immediate delete entries as it breaks CalDAV/CardDAV sync

Browse Source 
always show deleted filter and set deleted status in calendar
see #29778
This commit is contained in:
Ralf Becker 2021-07-07 11:21:45 +02:00
parent d8bb858efc
commit 4152c957fa
4 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/src/Contacts/Storage.php
View File

@ -323,10 +323,7 @@ class Storage
))); )));
} }
// Add in deleted type, if holding deleted contacts // Always add in deleted type, to show deleted contacts
$config = Api\Config::read('phpgwapi');
if($config['history'])
{
$this->content_types[self::DELETED_TYPE] = array( $this->content_types[self::DELETED_TYPE] = array(
'name' => lang('Deleted'), 'name' => lang('Deleted'),
'options' => array( 'options' => array(
@ -335,7 +332,6 @@ class Storage
) )
); );
} }
}
/** /**
* Get grants for a given user, taking into account static LDAP ACL * Get grants for a given user, taking into account static LDAP ACL

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

@ -1906,7 +1906,7 @@ class calendar_boupdate extends calendar_bo
// delete all links to the event // delete all links to the event
Link::unlink(0,'calendar',$cal_id); Link::unlink(0,'calendar',$cal_id);
} }
elseif ($config['calendar_delete_history']) else
{ {
// mark all links to the event as deleted, but keep them // mark all links to the event as deleted, but keep them
Link::unlink(0,'calendar',$cal_id,'','','',true); Link::unlink(0,'calendar',$cal_id,'','','',true);

3
infolog/inc/class.infolog_bo.inc.php
View File

@ -1960,6 +1960,9 @@ class infolog_bo
$labels = implode(', ', $labels); $labels = implode(', ', $labels);
} }
} }
// always add deleted status
$statis['deleted'] = 'deleted';
return $statis; return $statis;
} }

4
infolog/inc/class.infolog_ui.inc.php
View File

@ -532,10 +532,6 @@ class infolog_ui
// if filtered by type, show only the stati of the filtered type // if filtered by type, show only the stati of the filtered type
$rows['sel_options']['info_status'] = $this->bo->get_status($query['col_filter']['info_type']); $rows['sel_options']['info_status'] = $this->bo->get_status($query['col_filter']['info_type']);
if ($this->bo->history)
{
$rows['sel_options']['info_status']['deleted'] = 'deleted';
}
// Update actions for selected type / status / etc. // Update actions for selected type / status / etc.
$query['actions'] = $this->get_actions($query); $query['actions'] = $this->get_actions($query);