extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-18 11:21:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix role handling in get_recurrences()

Browse Source
This commit is contained in:
Jörg Lehrke 2009-11-26 20:21:16 +00:00
parent 6a7b07e3c6
commit 0f77f7e802
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
calendar/inc/class.calendar_so.inc.php
View File

@ -1112,8 +1112,8 @@ ORDER BY cal_user_type, cal_usre_id
$type = ''; $type = '';
$id = null; $id = null;
$this->split_user($uid,$type,$id); self::split_user($uid,$type,$id);
$this->split_status($status,$quantity,$role); self::split_status($status,$quantity,$role);
$this->db->insert($this->user_table,array( $this->db->insert($this->user_table,array(
'cal_status' => $status, 'cal_status' => $status,
'cal_quantity' => $quantity, 'cal_quantity' => $quantity,
@ -1381,10 +1381,11 @@ ORDER BY cal_user_type, cal_usre_id
'cal_user_type' => $user_type ? $user_type : 'u', 'cal_user_type' => $user_type ? $user_type : 'u',
'cal_user_id' => $user_id, 'cal_user_id' => $user_id,
); );
foreach ($this->db->select($this->user_table,'cal_recur_date,cal_status',$where, foreach ($this->db->select($this->user_table,'cal_recur_date,cal_status,cal_quantity,cal_role',$where,
__LINE__,__FILE__,false,'','calendar') as $row) __LINE__,__FILE__,false,'','calendar') as $row)
{ {
$participant_status[$row['cal_recur_date']] = $row['cal_status']; $status = self::combine_status($row['cal_status'],$row['cal_quantity'],$row['cal_role']);
$participant_status[$row['cal_recur_date']] = $status;
} }
return $participant_status; return $participant_status;
} }