mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-25 16:18:57 +01:00
* Calendar: taking direct booking permission into account when copying events including resources (my.stylite bug #2839)
This commit is contained in:
parent
ac09e58bea
commit
45e27331e9
@ -494,7 +494,9 @@ class calendar_uiforms extends calendar_ui
|
|||||||
{
|
{
|
||||||
if($type == 'u' && $id == $event['owner']) continue;
|
if($type == 'u' && $id == $event['owner']) continue;
|
||||||
calendar_so::split_status($status, $quantity, $role);
|
calendar_so::split_status($status, $quantity, $role);
|
||||||
$response = calendar_so::combine_status('U',$quantity,$role);
|
// if resource defines callback for status of new status (eg. Resources app acknowledges direct booking acl), call it
|
||||||
|
$status = isset($this->bo->resources[$type]['new_status']) ? ExecMethod($this->bo->resources[$type]['new_status'],$id) : 'U';
|
||||||
|
$response = calendar_so::combine_status($status,$quantity,$role);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
$preserv['view'] = $preserv['edit_single'] = false;
|
$preserv['view'] = $preserv['edit_single'] = false;
|
||||||
|
Loading…
Reference in New Issue
Block a user