extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-05 04:49:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

When deleting but keeping contacts, hold on to links as well so they can be restored if contact is restored.

Browse Source
This commit is contained in:
Nathan Gray 2010-09-27 16:39:54 +00:00
parent 272d30c3a7
commit d7168805c9
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
addressbook/inc/class.addressbook_bo.inc.php
View File

@ -724,6 +724,7 @@ class addressbook_bo extends addressbook_so
$delete = $old; $delete = $old;
$delete['tid'] = addressbook_so::DELETED_TYPE; $delete['tid'] = addressbook_so::DELETED_TYPE;
$ok = $this->save($delete); $ok = $this->save($delete);
egw_link::unlink(0,'addressbook',$id,'','','',true);
} }
elseif (($ok = parent::delete($id,$check_etag))) elseif (($ok = parent::delete($id,$check_etag)))
{ {
@ -848,6 +849,12 @@ class addressbook_bo extends addressbook_so
// Notify linked apps about changes in the contact data // Notify linked apps about changes in the contact data
egw_link::notify_update('addressbook', $contact['id'], $contact); egw_link::notify_update('addressbook', $contact['id'], $contact);
// Check for restore of deleted contact, restore held links
if($old['tid'] == addressbook_so::DELETED_TYPE && $contact['tid'] != addressbook_so::DELETED_TYPE)
{
egw_link::restore('addressbook', $contact['id']);
}
// Record change history for sql - doesn't work for LDAP accounts // Record change history for sql - doesn't work for LDAP accounts
if(!$contact['account_id'] || $contact['account_id'] && $this->account_repository == 'sql') { if(!$contact['account_id'] || $contact['account_id'] && $this->account_repository == 'sql') {
$deleted = ($old['tid'] == addressbook_so::DELETED_TYPE || $contact['tid'] == addressbook_so::DELETED_TYPE); $deleted = ($old['tid'] == addressbook_so::DELETED_TYPE || $contact['tid'] == addressbook_so::DELETED_TYPE);

11
addressbook/inc/class.addressbook_ui.inc.php
View File

@ -1516,6 +1516,12 @@ class addressbook_ui extends addressbook_bo
'to_id' => $content['link_to']['to_id'], 'to_id' => $content['link_to']['to_id'],
); );
// Links for deleted entries
if($content['tid'] == addressbook_so::DELETED_TYPE)
{
$content['link_to']['show_deleted'] = true;
}
// Enable history // Enable history
$this->setup_history($content, $sel_options); $this->setup_history($content, $sel_options);
@ -1690,6 +1696,11 @@ class addressbook_ui extends addressbook_bo
'to_app' => 'addressbook', 'to_app' => 'addressbook',
'to_id' => $content['id'], 'to_id' => $content['id'],
); );
// Links for deleted entries
if($content['tid'] == addressbook_so::DELETED_TYPE)
{
$content['link_to']['show_deleted'] = true;
}
$readonlys['link_to'] = $readonlys['customfields'] = $readonlys['fileas_type'] = true; $readonlys['link_to'] = $readonlys['customfields'] = $readonlys['fileas_type'] = true;
$readonlys['button[save]'] = $readonlys['button[apply]'] = $readonlys['change_photo'] = true; $readonlys['button[save]'] = $readonlys['button[apply]'] = $readonlys['change_photo'] = true;
$readonlys['button[delete]'] = !$content['owner'] || !$this->check_perms(EGW_ACL_DELETE,$content); $readonlys['button[delete]'] = !$content['owner'] || !$this->check_perms(EGW_ACL_DELETE,$content);