extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Delete & hold accessories when deleting a resource

Browse Source
This commit is contained in:
Nathan Gray 2012-12-31 21:57:14 +00:00
parent 880e55f9a2
commit fcda447798
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
resources/inc/class.resources_bo.inc.php
View File

@ -395,7 +395,7 @@ class resources_bo
return lang('You are not permitted to delete this resource!'); return lang('You are not permitted to delete this resource!');
} }
// check if we only mark timesheets as deleted, or really delete them // check if we only mark resources as deleted, or really delete them
$old = $this->read($res_id); $old = $this->read($res_id);
$config = config::read('resources'); $config = config::read('resources');
if ($config['history'] != '' && $old['deleted'] == null) if ($config['history'] != '' && $old['deleted'] == null)
@ -403,6 +403,11 @@ class resources_bo
$old['deleted'] = time(); $old['deleted'] = time();
$this->save($old); $this->save($old);
egw_link::unlink(0,'resources',$res_id,'','','',true); egw_link::unlink(0,'resources',$res_id,'','','',true);
$accessories = $this->get_acc_list($res_id);
foreach($accessories as $acc_id => $name)
{
$this->delete($acc_id);
}
return false; return false;
} }
elseif ($this->so->delete(array('res_id'=>$res_id))) elseif ($this->so->delete(array('res_id'=>$res_id)))